From 158890b8df055fa67e3e8566ddc46c3b790c6f6b Mon Sep 17 00:00:00 2001 From: Alex Woods Date: Tue, 30 Jul 2024 12:02:15 -0700 Subject: [PATCH] Consolidate Client operationGeneration into one method --- .../rails_json/lib/rails_json/client.rb | 195 ++++++++++------ .../rails_json/lib/rails_json/middleware.rb | 130 +++++------ .../rpcv2_cbor/lib/rpcv2_cbor/client.rb | 39 ++-- .../rpcv2_cbor/lib/rpcv2_cbor/middleware.rb | 26 +-- .../white_label/lib/white_label/client.rb | 218 ++++++++++-------- .../white_label/lib/white_label/middleware.rb | 50 ++-- .../codegen/generators/ClientGenerator.java | 109 ++++----- .../generators/MiddlewareGenerator.java | 2 +- 8 files changed, 425 insertions(+), 344 deletions(-) diff --git a/codegen/projections/rails_json/lib/rails_json/client.rb b/codegen/projections/rails_json/lib/rails_json/client.rb index df4510e7f..59d90f8f4 100644 --- a/codegen/projections/rails_json/lib/rails_json/client.rb +++ b/codegen/projections/rails_json/lib/rails_json/client.rb @@ -82,9 +82,10 @@ def initialize(options = {}) # resp.data #=> Types::AllQueryStringTypesOutput def all_query_string_types(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::AllQueryStringTypesInput.build(params, context: 'params') - stack = RailsJson::Middleware::AllQueryStringTypes.build(config) + stack = RailsJson::Middleware::AllQueryStringTypes.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -120,9 +121,10 @@ def all_query_string_types(params = {}, options = {}) # resp.data #=> Types::ConstantAndVariableQueryStringOutput def constant_and_variable_query_string(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::ConstantAndVariableQueryStringInput.build(params, context: 'params') - stack = RailsJson::Middleware::ConstantAndVariableQueryString.build(config) + stack = RailsJson::Middleware::ConstantAndVariableQueryString.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -158,9 +160,10 @@ def constant_and_variable_query_string(params = {}, options = {}) # resp.data #=> Types::ConstantQueryStringOutput def constant_query_string(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::ConstantQueryStringInput.build(params, context: 'params') - stack = RailsJson::Middleware::ConstantQueryString.build(config) + stack = RailsJson::Middleware::ConstantQueryString.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -192,9 +195,10 @@ def constant_query_string(params = {}, options = {}) # resp.data.datetime #=> Time def datetime_offsets(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::DatetimeOffsetsInput.build(params, context: 'params') - stack = RailsJson::Middleware::DatetimeOffsets.build(config) + stack = RailsJson::Middleware::DatetimeOffsets.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -237,9 +241,10 @@ def datetime_offsets(params = {}, options = {}) # resp.data.document_value #=> Hash, Array, String, Boolean, Numeric def document_type(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::DocumentTypeInput.build(params, context: 'params') - stack = RailsJson::Middleware::DocumentType.build(config) + stack = RailsJson::Middleware::DocumentType.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -283,9 +288,10 @@ def document_type(params = {}, options = {}) # resp.data.doc_valued_map['key'] #=> Hash, Array, String, Boolean, Numeric def document_type_as_map_value(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::DocumentTypeAsMapValueInput.build(params, context: 'params') - stack = RailsJson::Middleware::DocumentTypeAsMapValue.build(config) + stack = RailsJson::Middleware::DocumentTypeAsMapValue.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -326,9 +332,10 @@ def document_type_as_map_value(params = {}, options = {}) # resp.data.document_value #=> Hash, Array, String, Boolean, Numeric def document_type_as_payload(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::DocumentTypeAsPayloadInput.build(params, context: 'params') - stack = RailsJson::Middleware::DocumentTypeAsPayload.build(config) + stack = RailsJson::Middleware::DocumentTypeAsPayload.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -362,9 +369,10 @@ def document_type_as_payload(params = {}, options = {}) # resp.data #=> Types::EmptyInputAndEmptyOutputOutput def empty_input_and_empty_output(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::EmptyInputAndEmptyOutputInput.build(params, context: 'params') - stack = RailsJson::Middleware::EmptyInputAndEmptyOutput.build(config) + stack = RailsJson::Middleware::EmptyInputAndEmptyOutput.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -394,9 +402,10 @@ def empty_input_and_empty_output(params = {}, options = {}) # resp.data #=> Types::EndpointOperationOutput def endpoint_operation(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::EndpointOperationInput.build(params, context: 'params') - stack = RailsJson::Middleware::EndpointOperation.build(config) + stack = RailsJson::Middleware::EndpointOperation.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -428,9 +437,10 @@ def endpoint_operation(params = {}, options = {}) # resp.data #=> Types::EndpointWithHostLabelOperationOutput def endpoint_with_host_label_operation(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::EndpointWithHostLabelOperationInput.build(params, context: 'params') - stack = RailsJson::Middleware::EndpointWithHostLabelOperation.build(config) + stack = RailsJson::Middleware::EndpointWithHostLabelOperation.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -462,9 +472,10 @@ def endpoint_with_host_label_operation(params = {}, options = {}) # resp.data.datetime #=> Time def fractional_seconds(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::FractionalSecondsInput.build(params, context: 'params') - stack = RailsJson::Middleware::FractionalSeconds.build(config) + stack = RailsJson::Middleware::FractionalSeconds.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -504,9 +515,10 @@ def fractional_seconds(params = {}, options = {}) # resp.data.greeting #=> String def greeting_with_errors(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::GreetingWithErrorsInput.build(params, context: 'params') - stack = RailsJson::Middleware::GreetingWithErrors.build(config) + stack = RailsJson::Middleware::GreetingWithErrors.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -536,9 +548,10 @@ def greeting_with_errors(params = {}, options = {}) # resp.data #=> Types::HostWithPathOperationOutput def host_with_path_operation(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HostWithPathOperationInput.build(params, context: 'params') - stack = RailsJson::Middleware::HostWithPathOperation.build(config) + stack = RailsJson::Middleware::HostWithPathOperation.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -572,9 +585,10 @@ def host_with_path_operation(params = {}, options = {}) # resp.data.foo #=> String def http_checksum_required(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpChecksumRequiredInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpChecksumRequired.build(config) + stack = RailsJson::Middleware::HttpChecksumRequired.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -607,9 +621,10 @@ def http_checksum_required(params = {}, options = {}) # resp.data.payload #=> String, one of ["enumvalue"] def http_enum_payload(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpEnumPayloadInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpEnumPayload.build(config) + stack = RailsJson::Middleware::HttpEnumPayload.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -648,9 +663,10 @@ def http_enum_payload(params = {}, options = {}) # resp.data.blob #=> String def http_payload_traits(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpPayloadTraitsInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpPayloadTraits.build(config) + stack = RailsJson::Middleware::HttpPayloadTraits.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -687,9 +703,10 @@ def http_payload_traits(params = {}, options = {}) # resp.data.blob #=> String def http_payload_traits_with_media_type(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpPayloadTraitsWithMediaTypeInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpPayloadTraitsWithMediaType.build(config) + stack = RailsJson::Middleware::HttpPayloadTraitsWithMediaType.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -731,9 +748,10 @@ def http_payload_traits_with_media_type(params = {}, options = {}) # resp.data.nested.name #=> String def http_payload_with_structure(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpPayloadWithStructureInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpPayloadWithStructure.build(config) + stack = RailsJson::Middleware::HttpPayloadWithStructure.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -771,9 +789,10 @@ def http_payload_with_structure(params = {}, options = {}) # resp.data.nested.greeting #=> String def http_payload_with_union(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpPayloadWithUnionInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpPayloadWithUnion.build(config) + stack = RailsJson::Middleware::HttpPayloadWithUnion.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -813,9 +832,10 @@ def http_payload_with_union(params = {}, options = {}) # resp.data.foo_map['key'] #=> String def http_prefix_headers(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpPrefixHeadersInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpPrefixHeaders.build(config) + stack = RailsJson::Middleware::HttpPrefixHeaders.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -848,9 +868,10 @@ def http_prefix_headers(params = {}, options = {}) # resp.data.prefix_headers['key'] #=> String def http_prefix_headers_in_response(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpPrefixHeadersInResponseInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpPrefixHeadersInResponse.build(config) + stack = RailsJson::Middleware::HttpPrefixHeadersInResponse.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -883,9 +904,10 @@ def http_prefix_headers_in_response(params = {}, options = {}) # resp.data #=> Types::HttpRequestWithFloatLabelsOutput def http_request_with_float_labels(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpRequestWithFloatLabelsInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpRequestWithFloatLabels.build(config) + stack = RailsJson::Middleware::HttpRequestWithFloatLabels.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -918,9 +940,10 @@ def http_request_with_float_labels(params = {}, options = {}) # resp.data #=> Types::HttpRequestWithGreedyLabelInPathOutput def http_request_with_greedy_label_in_path(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpRequestWithGreedyLabelInPathInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpRequestWithGreedyLabelInPath.build(config) + stack = RailsJson::Middleware::HttpRequestWithGreedyLabelInPath.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -961,9 +984,10 @@ def http_request_with_greedy_label_in_path(params = {}, options = {}) # resp.data #=> Types::HttpRequestWithLabelsOutput def http_request_with_labels(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpRequestWithLabelsInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpRequestWithLabels.build(config) + stack = RailsJson::Middleware::HttpRequestWithLabels.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1003,9 +1027,10 @@ def http_request_with_labels(params = {}, options = {}) # resp.data #=> Types::HttpRequestWithLabelsAndTimestampFormatOutput def http_request_with_labels_and_timestamp_format(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpRequestWithLabelsAndTimestampFormatInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpRequestWithLabelsAndTimestampFormat.build(config) + stack = RailsJson::Middleware::HttpRequestWithLabelsAndTimestampFormat.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1037,9 +1062,10 @@ def http_request_with_labels_and_timestamp_format(params = {}, options = {}) # resp.data #=> Types::HttpRequestWithRegexLiteralOutput def http_request_with_regex_literal(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpRequestWithRegexLiteralInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpRequestWithRegexLiteral.build(config) + stack = RailsJson::Middleware::HttpRequestWithRegexLiteral.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1070,9 +1096,10 @@ def http_request_with_regex_literal(params = {}, options = {}) # resp.data.status #=> Integer def http_response_code(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpResponseCodeInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpResponseCode.build(config) + stack = RailsJson::Middleware::HttpResponseCode.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1105,9 +1132,10 @@ def http_response_code(params = {}, options = {}) # resp.data.payload #=> String def http_string_payload(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpStringPayloadInput.build(params, context: 'params') - stack = RailsJson::Middleware::HttpStringPayload.build(config) + stack = RailsJson::Middleware::HttpStringPayload.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1141,9 +1169,10 @@ def http_string_payload(params = {}, options = {}) # resp.data.baz #=> String def ignore_query_params_in_response(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::IgnoreQueryParamsInResponseInput.build(params, context: 'params') - stack = RailsJson::Middleware::IgnoreQueryParamsInResponse.build(config) + stack = RailsJson::Middleware::IgnoreQueryParamsInResponse.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1233,9 +1262,10 @@ def ignore_query_params_in_response(params = {}, options = {}) # resp.data.header_integer_enum_list[0] #=> Integer def input_and_output_with_headers(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::InputAndOutputWithHeadersInput.build(params, context: 'params') - stack = RailsJson::Middleware::InputAndOutputWithHeaders.build(config) + stack = RailsJson::Middleware::InputAndOutputWithHeaders.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1269,9 +1299,10 @@ def input_and_output_with_headers(params = {}, options = {}) # resp.data.data #=> String def json_blobs(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::JsonBlobsInput.build(params, context: 'params') - stack = RailsJson::Middleware::JsonBlobs.build(config) + stack = RailsJson::Middleware::JsonBlobs.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1324,9 +1355,10 @@ def json_blobs(params = {}, options = {}) # resp.data.foo_enum_map['key'] #=> String, one of ["Foo", "Baz", "Bar", "1", "0"] def json_enums(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::JsonEnumsInput.build(params, context: 'params') - stack = RailsJson::Middleware::JsonEnums.build(config) + stack = RailsJson::Middleware::JsonEnums.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1379,9 +1411,10 @@ def json_enums(params = {}, options = {}) # resp.data.integer_enum_map['key'] #=> Integer def json_int_enums(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::JsonIntEnumsInput.build(params, context: 'params') - stack = RailsJson::Middleware::JsonIntEnums.build(config) + stack = RailsJson::Middleware::JsonIntEnums.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1465,9 +1498,10 @@ def json_int_enums(params = {}, options = {}) # resp.data.structure_list[0].b #=> String def json_lists(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::JsonListsInput.build(params, context: 'params') - stack = RailsJson::Middleware::JsonLists.build(config) + stack = RailsJson::Middleware::JsonLists.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1530,9 +1564,10 @@ def json_lists(params = {}, options = {}) # resp.data.dense_set_map['key'][0] #=> String def json_maps(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::JsonMapsInput.build(params, context: 'params') - stack = RailsJson::Middleware::JsonMaps.build(config) + stack = RailsJson::Middleware::JsonMaps.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1580,9 +1615,10 @@ def json_maps(params = {}, options = {}) # resp.data.http_date_on_target #=> Time def json_timestamps(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::JsonTimestampsInput.build(params, context: 'params') - stack = RailsJson::Middleware::JsonTimestamps.build(config) + stack = RailsJson::Middleware::JsonTimestamps.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1650,9 +1686,10 @@ def json_timestamps(params = {}, options = {}) # resp.data.contents.renamed_structure_value.salutation #=> String def json_unions(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::JsonUnionsInput.build(params, context: 'params') - stack = RailsJson::Middleware::JsonUnions.build(config) + stack = RailsJson::Middleware::JsonUnions.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1686,9 +1723,10 @@ def json_unions(params = {}, options = {}) # resp.data.json #=> String def media_type_header(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::MediaTypeHeaderInput.build(params, context: 'params') - stack = RailsJson::Middleware::MediaTypeHeader.build(config) + stack = RailsJson::Middleware::MediaTypeHeader.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1721,9 +1759,10 @@ def media_type_header(params = {}, options = {}) # resp.data #=> Types::NoInputAndNoOutputOutput def no_input_and_no_output(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::NoInputAndNoOutputInput.build(params, context: 'params') - stack = RailsJson::Middleware::NoInputAndNoOutput.build(config) + stack = RailsJson::Middleware::NoInputAndNoOutput.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1757,9 +1796,10 @@ def no_input_and_no_output(params = {}, options = {}) # resp.data #=> Types::NoInputAndOutputOutput def no_input_and_output(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::NoInputAndOutputInput.build(params, context: 'params') - stack = RailsJson::Middleware::NoInputAndOutput.build(config) + stack = RailsJson::Middleware::NoInputAndOutput.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1801,9 +1841,10 @@ def no_input_and_output(params = {}, options = {}) # resp.data.c[0] #=> String def null_and_empty_headers_client(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::NullAndEmptyHeadersClientInput.build(params, context: 'params') - stack = RailsJson::Middleware::NullAndEmptyHeadersClient.build(config) + stack = RailsJson::Middleware::NullAndEmptyHeadersClient.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1845,9 +1886,10 @@ def null_and_empty_headers_client(params = {}, options = {}) # resp.data.c[0] #=> String def null_and_empty_headers_server(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::NullAndEmptyHeadersServerInput.build(params, context: 'params') - stack = RailsJson::Middleware::NullAndEmptyHeadersServer.build(config) + stack = RailsJson::Middleware::NullAndEmptyHeadersServer.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1881,9 +1923,10 @@ def null_and_empty_headers_server(params = {}, options = {}) # resp.data #=> Types::OmitsNullSerializesEmptyStringOutput def omits_null_serializes_empty_string(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::OmitsNullSerializesEmptyStringInput.build(params, context: 'params') - stack = RailsJson::Middleware::OmitsNullSerializesEmptyString.build(config) + stack = RailsJson::Middleware::OmitsNullSerializesEmptyString.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1939,9 +1982,10 @@ def omits_null_serializes_empty_string(params = {}, options = {}) # resp.data #=> Types::OmitsSerializingEmptyListsOutput def omits_serializing_empty_lists(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::OmitsSerializingEmptyListsInput.build(params, context: 'params') - stack = RailsJson::Middleware::OmitsSerializingEmptyLists.build(config) + stack = RailsJson::Middleware::OmitsSerializingEmptyLists.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2044,9 +2088,10 @@ def omits_serializing_empty_lists(params = {}, options = {}) # resp.data.zero_double #=> Float def operation_with_defaults(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::OperationWithDefaultsInput.build(params, context: 'params') - stack = RailsJson::Middleware::OperationWithDefaults.build(config) + stack = RailsJson::Middleware::OperationWithDefaults.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2093,9 +2138,10 @@ def operation_with_defaults(params = {}, options = {}) # resp.data.dialog_map #=> Hash def operation_with_nested_structure(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::OperationWithNestedStructureInput.build(params, context: 'params') - stack = RailsJson::Middleware::OperationWithNestedStructure.build(config) + stack = RailsJson::Middleware::OperationWithNestedStructure.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2133,9 +2179,10 @@ def operation_with_nested_structure(params = {}, options = {}) # resp.data.action.quit #=> Types::Unit def post_player_action(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::PostPlayerActionInput.build(params, context: 'params') - stack = RailsJson::Middleware::PostPlayerAction.build(config) + stack = RailsJson::Middleware::PostPlayerAction.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2177,9 +2224,10 @@ def post_player_action(params = {}, options = {}) # resp.data.value.baz #=> String def post_union_with_json_name(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::PostUnionWithJsonNameInput.build(params, context: 'params') - stack = RailsJson::Middleware::PostUnionWithJsonName.build(config) + stack = RailsJson::Middleware::PostUnionWithJsonName.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2212,9 +2260,10 @@ def post_union_with_json_name(params = {}, options = {}) # resp.data #=> Types::PutWithContentEncodingOutput def put_with_content_encoding(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::PutWithContentEncodingInput.build(params, context: 'params') - stack = RailsJson::Middleware::PutWithContentEncoding.build(config) + stack = RailsJson::Middleware::PutWithContentEncoding.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2248,9 +2297,10 @@ def put_with_content_encoding(params = {}, options = {}) # resp.data #=> Types::QueryIdempotencyTokenAutoFillOutput def query_idempotency_token_auto_fill(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::QueryIdempotencyTokenAutoFillInput.build(params, context: 'params') - stack = RailsJson::Middleware::QueryIdempotencyTokenAutoFill.build(config) + stack = RailsJson::Middleware::QueryIdempotencyTokenAutoFill.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2287,9 +2337,10 @@ def query_idempotency_token_auto_fill(params = {}, options = {}) # resp.data #=> Types::QueryParamsAsStringListMapOutput def query_params_as_string_list_map(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::QueryParamsAsStringListMapInput.build(params, context: 'params') - stack = RailsJson::Middleware::QueryParamsAsStringListMap.build(config) + stack = RailsJson::Middleware::QueryParamsAsStringListMap.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2324,9 +2375,10 @@ def query_params_as_string_list_map(params = {}, options = {}) # resp.data #=> Types::QueryPrecedenceOutput def query_precedence(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::QueryPrecedenceInput.build(params, context: 'params') - stack = RailsJson::Middleware::QueryPrecedence.build(config) + stack = RailsJson::Middleware::QueryPrecedence.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2369,9 +2421,10 @@ def query_precedence(params = {}, options = {}) # resp.data.nested.nested.recursive_member #=> Types::RecursiveShapesInputOutputNested1 def recursive_shapes(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::RecursiveShapesInput.build(params, context: 'params') - stack = RailsJson::Middleware::RecursiveShapes.build(config) + stack = RailsJson::Middleware::RecursiveShapes.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2422,9 +2475,10 @@ def recursive_shapes(params = {}, options = {}) # resp.data.double_value #=> Float def simple_scalar_properties(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::SimpleScalarPropertiesInput.build(params, context: 'params') - stack = RailsJson::Middleware::SimpleScalarProperties.build(config) + stack = RailsJson::Middleware::SimpleScalarProperties.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2460,9 +2514,10 @@ def simple_scalar_properties(params = {}, options = {}) # resp.data.sparse_string_list[0] #=> String def sparse_json_lists(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::SparseJsonListsInput.build(params, context: 'params') - stack = RailsJson::Middleware::SparseJsonLists.build(config) + stack = RailsJson::Middleware::SparseJsonLists.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2525,9 +2580,10 @@ def sparse_json_lists(params = {}, options = {}) # resp.data.sparse_set_map['key'][0] #=> String def sparse_json_maps(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::SparseJsonMapsInput.build(params, context: 'params') - stack = RailsJson::Middleware::SparseJsonMaps.build(config) + stack = RailsJson::Middleware::SparseJsonMaps.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2566,9 +2622,10 @@ def sparse_json_maps(params = {}, options = {}) # resp.data.blob #=> IO def streaming_traits(params = {}, options = {}, &block) response_body = output_stream(options, &block) + middleware_opts = {} config = operation_config(options) input = Params::StreamingTraitsInput.build(params, context: 'params') - stack = RailsJson::Middleware::StreamingTraits.build(config) + stack = RailsJson::Middleware::StreamingTraits.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2606,9 +2663,10 @@ def streaming_traits(params = {}, options = {}, &block) # resp.data #=> Types::StreamingTraitsRequireLengthOutput def streaming_traits_require_length(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::StreamingTraitsRequireLengthInput.build(params, context: 'params') - stack = RailsJson::Middleware::StreamingTraitsRequireLength.build(config) + stack = RailsJson::Middleware::StreamingTraitsRequireLength.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2647,9 +2705,10 @@ def streaming_traits_require_length(params = {}, options = {}) # resp.data.blob #=> IO def streaming_traits_with_media_type(params = {}, options = {}, &block) response_body = output_stream(options, &block) + middleware_opts = {} config = operation_config(options) input = Params::StreamingTraitsWithMediaTypeInput.build(params, context: 'params') - stack = RailsJson::Middleware::StreamingTraitsWithMediaType.build(config) + stack = RailsJson::Middleware::StreamingTraitsWithMediaType.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2693,9 +2752,10 @@ def streaming_traits_with_media_type(params = {}, options = {}, &block) # resp.data.test_config.timeout #=> Integer def test_body_structure(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::TestBodyStructureInput.build(params, context: 'params') - stack = RailsJson::Middleware::TestBodyStructure.build(config) + stack = RailsJson::Middleware::TestBodyStructure.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2734,9 +2794,10 @@ def test_body_structure(params = {}, options = {}) # resp.data.test_id #=> String def test_no_payload(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::TestNoPayloadInput.build(params, context: 'params') - stack = RailsJson::Middleware::TestNoPayload.build(config) + stack = RailsJson::Middleware::TestNoPayload.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2779,9 +2840,10 @@ def test_no_payload(params = {}, options = {}) # resp.data.data #=> String def test_payload_blob(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::TestPayloadBlobInput.build(params, context: 'params') - stack = RailsJson::Middleware::TestPayloadBlob.build(config) + stack = RailsJson::Middleware::TestPayloadBlob.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2824,9 +2886,10 @@ def test_payload_blob(params = {}, options = {}) # resp.data.payload_config.data #=> Integer def test_payload_structure(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::TestPayloadStructureInput.build(params, context: 'params') - stack = RailsJson::Middleware::TestPayloadStructure.build(config) + stack = RailsJson::Middleware::TestPayloadStructure.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2872,9 +2935,10 @@ def test_payload_structure(params = {}, options = {}) # resp.data.target_date_time #=> Time def timestamp_format_headers(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::TimestampFormatHeadersInput.build(params, context: 'params') - stack = RailsJson::Middleware::TimestampFormatHeaders.build(config) + stack = RailsJson::Middleware::TimestampFormatHeaders.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -2905,9 +2969,10 @@ def timestamp_format_headers(params = {}, options = {}) # resp.data #=> Types::UnitInputAndOutputOutput def unit_input_and_output(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::UnitInputAndOutputInput.build(params, context: 'params') - stack = RailsJson::Middleware::UnitInputAndOutput.build(config) + stack = RailsJson::Middleware::UnitInputAndOutput.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), diff --git a/codegen/projections/rails_json/lib/rails_json/middleware.rb b/codegen/projections/rails_json/lib/rails_json/middleware.rb index 3b119bc1a..ea57521c3 100644 --- a/codegen/projections/rails_json/lib/rails_json/middleware.rb +++ b/codegen/projections/rails_json/lib/rails_json/middleware.rb @@ -14,7 +14,7 @@ module RailsJson module Middleware class AllQueryStringTypes - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -61,7 +61,7 @@ def self.build(config, options={}) end class ConstantAndVariableQueryString - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -108,7 +108,7 @@ def self.build(config, options={}) end class ConstantQueryString - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -155,7 +155,7 @@ def self.build(config, options={}) end class DatetimeOffsets - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -202,7 +202,7 @@ def self.build(config, options={}) end class DocumentType - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -249,7 +249,7 @@ def self.build(config, options={}) end class DocumentTypeAsMapValue - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -296,7 +296,7 @@ def self.build(config, options={}) end class DocumentTypeAsPayload - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -343,7 +343,7 @@ def self.build(config, options={}) end class EmptyInputAndEmptyOutput - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -390,7 +390,7 @@ def self.build(config, options={}) end class EndpointOperation - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -441,7 +441,7 @@ def self.build(config, options={}) end class EndpointWithHostLabelOperation - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -492,7 +492,7 @@ def self.build(config, options={}) end class FractionalSeconds - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -539,7 +539,7 @@ def self.build(config, options={}) end class GreetingWithErrors - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -586,7 +586,7 @@ def self.build(config, options={}) end class HostWithPathOperation - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -633,7 +633,7 @@ def self.build(config, options={}) end class HttpChecksumRequired - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -681,7 +681,7 @@ def self.build(config, options={}) end class HttpEnumPayload - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -728,7 +728,7 @@ def self.build(config, options={}) end class HttpPayloadTraits - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -775,7 +775,7 @@ def self.build(config, options={}) end class HttpPayloadTraitsWithMediaType - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -822,7 +822,7 @@ def self.build(config, options={}) end class HttpPayloadWithStructure - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -869,7 +869,7 @@ def self.build(config, options={}) end class HttpPayloadWithUnion - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -916,7 +916,7 @@ def self.build(config, options={}) end class HttpPrefixHeaders - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -963,7 +963,7 @@ def self.build(config, options={}) end class HttpPrefixHeadersInResponse - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1010,7 +1010,7 @@ def self.build(config, options={}) end class HttpRequestWithFloatLabels - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1057,7 +1057,7 @@ def self.build(config, options={}) end class HttpRequestWithGreedyLabelInPath - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1104,7 +1104,7 @@ def self.build(config, options={}) end class HttpRequestWithLabels - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1151,7 +1151,7 @@ def self.build(config, options={}) end class HttpRequestWithLabelsAndTimestampFormat - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1198,7 +1198,7 @@ def self.build(config, options={}) end class HttpRequestWithRegexLiteral - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1245,7 +1245,7 @@ def self.build(config, options={}) end class HttpResponseCode - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1292,7 +1292,7 @@ def self.build(config, options={}) end class HttpStringPayload - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1339,7 +1339,7 @@ def self.build(config, options={}) end class IgnoreQueryParamsInResponse - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1386,7 +1386,7 @@ def self.build(config, options={}) end class InputAndOutputWithHeaders - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1433,7 +1433,7 @@ def self.build(config, options={}) end class JsonBlobs - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1480,7 +1480,7 @@ def self.build(config, options={}) end class JsonEnums - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1527,7 +1527,7 @@ def self.build(config, options={}) end class JsonIntEnums - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1574,7 +1574,7 @@ def self.build(config, options={}) end class JsonLists - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1621,7 +1621,7 @@ def self.build(config, options={}) end class JsonMaps - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1668,7 +1668,7 @@ def self.build(config, options={}) end class JsonTimestamps - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1715,7 +1715,7 @@ def self.build(config, options={}) end class JsonUnions - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1762,7 +1762,7 @@ def self.build(config, options={}) end class MediaTypeHeader - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1809,7 +1809,7 @@ def self.build(config, options={}) end class NoInputAndNoOutput - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1856,7 +1856,7 @@ def self.build(config, options={}) end class NoInputAndOutput - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1903,7 +1903,7 @@ def self.build(config, options={}) end class NullAndEmptyHeadersClient - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1950,7 +1950,7 @@ def self.build(config, options={}) end class NullAndEmptyHeadersServer - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -1997,7 +1997,7 @@ def self.build(config, options={}) end class OmitsNullSerializesEmptyString - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2044,7 +2044,7 @@ def self.build(config, options={}) end class OmitsSerializingEmptyLists - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2091,7 +2091,7 @@ def self.build(config, options={}) end class OperationWithDefaults - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2138,7 +2138,7 @@ def self.build(config, options={}) end class OperationWithNestedStructure - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2185,7 +2185,7 @@ def self.build(config, options={}) end class PostPlayerAction - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2232,7 +2232,7 @@ def self.build(config, options={}) end class PostUnionWithJsonName - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2279,7 +2279,7 @@ def self.build(config, options={}) end class PutWithContentEncoding - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2332,7 +2332,7 @@ def self.build(config, options={}) end class QueryIdempotencyTokenAutoFill - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2379,7 +2379,7 @@ def self.build(config, options={}) end class QueryParamsAsStringListMap - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2426,7 +2426,7 @@ def self.build(config, options={}) end class QueryPrecedence - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2473,7 +2473,7 @@ def self.build(config, options={}) end class RecursiveShapes - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2520,7 +2520,7 @@ def self.build(config, options={}) end class SimpleScalarProperties - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2567,7 +2567,7 @@ def self.build(config, options={}) end class SparseJsonLists - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2614,7 +2614,7 @@ def self.build(config, options={}) end class SparseJsonMaps - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2661,7 +2661,7 @@ def self.build(config, options={}) end class StreamingTraits - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2707,7 +2707,7 @@ def self.build(config, options={}) end class StreamingTraitsRequireLength - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2754,7 +2754,7 @@ def self.build(config, options={}) end class StreamingTraitsWithMediaType - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2800,7 +2800,7 @@ def self.build(config, options={}) end class TestBodyStructure - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2847,7 +2847,7 @@ def self.build(config, options={}) end class TestNoPayload - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2894,7 +2894,7 @@ def self.build(config, options={}) end class TestPayloadBlob - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2941,7 +2941,7 @@ def self.build(config, options={}) end class TestPayloadStructure - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -2988,7 +2988,7 @@ def self.build(config, options={}) end class TimestampFormatHeaders - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -3035,7 +3035,7 @@ def self.build(config, options={}) end class UnitInputAndOutput - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, diff --git a/codegen/projections/rpcv2_cbor/lib/rpcv2_cbor/client.rb b/codegen/projections/rpcv2_cbor/lib/rpcv2_cbor/client.rb index d23698254..d41f6022b 100644 --- a/codegen/projections/rpcv2_cbor/lib/rpcv2_cbor/client.rb +++ b/codegen/projections/rpcv2_cbor/lib/rpcv2_cbor/client.rb @@ -41,9 +41,10 @@ def initialize(options = {}) # resp.data #=> Types::EmptyInputOutputOutput def empty_input_output(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::EmptyInputOutputInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::EmptyInputOutput.build(config) + stack = Rpcv2Cbor::Middleware::EmptyInputOutput.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -75,9 +76,10 @@ def empty_input_output(params = {}, options = {}) # resp.data.value #=> Float def float16(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::Float16Input.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::Float16.build(config) + stack = Rpcv2Cbor::Middleware::Float16.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -109,9 +111,10 @@ def float16(params = {}, options = {}) # resp.data.datetime #=> Time def fractional_seconds(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::FractionalSecondsInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::FractionalSeconds.build(config) + stack = Rpcv2Cbor::Middleware::FractionalSeconds.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -150,9 +153,10 @@ def fractional_seconds(params = {}, options = {}) # resp.data.greeting #=> String def greeting_with_errors(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::GreetingWithErrorsInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::GreetingWithErrors.build(config) + stack = Rpcv2Cbor::Middleware::GreetingWithErrors.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -182,9 +186,10 @@ def greeting_with_errors(params = {}, options = {}) # resp.data #=> Types::NoInputOutputOutput def no_input_output(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::NoInputOutputInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::NoInputOutput.build(config) + stack = Rpcv2Cbor::Middleware::NoInputOutput.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -274,9 +279,10 @@ def no_input_output(params = {}, options = {}) # resp.data.zero_double #=> Float def operation_with_defaults(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::OperationWithDefaultsInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::OperationWithDefaults.build(config) + stack = Rpcv2Cbor::Middleware::OperationWithDefaults.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -309,9 +315,10 @@ def operation_with_defaults(params = {}, options = {}) # resp.data.value #=> String def optional_input_output(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::OptionalInputOutputInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::OptionalInputOutput.build(config) + stack = Rpcv2Cbor::Middleware::OptionalInputOutput.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -353,9 +360,10 @@ def optional_input_output(params = {}, options = {}) # resp.data.nested.nested.recursive_member #=> Types::RecursiveShapesInputOutputNested1 def recursive_shapes(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::RecursiveShapesInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::RecursiveShapes.build(config) + stack = Rpcv2Cbor::Middleware::RecursiveShapes.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -418,9 +426,10 @@ def recursive_shapes(params = {}, options = {}) # resp.data.dense_set_map['key'][0] #=> String def rpc_v2_cbor_dense_maps(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::RpcV2CborDenseMapsInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::RpcV2CborDenseMaps.build(config) + stack = Rpcv2Cbor::Middleware::RpcV2CborDenseMaps.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -509,9 +518,10 @@ def rpc_v2_cbor_dense_maps(params = {}, options = {}) # resp.data.blob_list[0] #=> String def rpc_v2_cbor_lists(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::RpcV2CborListsInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::RpcV2CborLists.build(config) + stack = Rpcv2Cbor::Middleware::RpcV2CborLists.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -573,9 +583,10 @@ def rpc_v2_cbor_lists(params = {}, options = {}) # resp.data.sparse_set_map['key'][0] #=> String def rpc_v2_cbor_sparse_maps(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::RpcV2CborSparseMapsInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::RpcV2CborSparseMaps.build(config) + stack = Rpcv2Cbor::Middleware::RpcV2CborSparseMaps.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -626,9 +637,10 @@ def rpc_v2_cbor_sparse_maps(params = {}, options = {}) # resp.data.blob_value #=> String def simple_scalar_properties(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::SimpleScalarPropertiesInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::SimpleScalarProperties.build(config) + stack = Rpcv2Cbor::Middleware::SimpleScalarProperties.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -669,9 +681,10 @@ def simple_scalar_properties(params = {}, options = {}) # resp.data.sparse_string_map['key'] #=> String def sparse_nulls_operation(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::SparseNullsOperationInput.build(params, context: 'params') - stack = Rpcv2Cbor::Middleware::SparseNullsOperation.build(config) + stack = Rpcv2Cbor::Middleware::SparseNullsOperation.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), diff --git a/codegen/projections/rpcv2_cbor/lib/rpcv2_cbor/middleware.rb b/codegen/projections/rpcv2_cbor/lib/rpcv2_cbor/middleware.rb index 3d7f756d8..6fdccbd67 100644 --- a/codegen/projections/rpcv2_cbor/lib/rpcv2_cbor/middleware.rb +++ b/codegen/projections/rpcv2_cbor/lib/rpcv2_cbor/middleware.rb @@ -12,7 +12,7 @@ module Rpcv2Cbor module Middleware class EmptyInputOutput - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -58,7 +58,7 @@ def self.build(config, options={}) end class Float16 - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -104,7 +104,7 @@ def self.build(config, options={}) end class FractionalSeconds - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -150,7 +150,7 @@ def self.build(config, options={}) end class GreetingWithErrors - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -196,7 +196,7 @@ def self.build(config, options={}) end class NoInputOutput - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -242,7 +242,7 @@ def self.build(config, options={}) end class OperationWithDefaults - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -288,7 +288,7 @@ def self.build(config, options={}) end class OptionalInputOutput - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -334,7 +334,7 @@ def self.build(config, options={}) end class RecursiveShapes - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -380,7 +380,7 @@ def self.build(config, options={}) end class RpcV2CborDenseMaps - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -426,7 +426,7 @@ def self.build(config, options={}) end class RpcV2CborLists - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -472,7 +472,7 @@ def self.build(config, options={}) end class RpcV2CborSparseMaps - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -518,7 +518,7 @@ def self.build(config, options={}) end class SimpleScalarProperties - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, @@ -564,7 +564,7 @@ def self.build(config, options={}) end class SparseNullsOperation - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Hearth::Middleware::Validate, diff --git a/codegen/projections/white_label/lib/white_label/client.rb b/codegen/projections/white_label/lib/white_label/client.rb index e6b091671..6f83b4045 100644 --- a/codegen/projections/white_label/lib/white_label/client.rb +++ b/codegen/projections/white_label/lib/white_label/client.rb @@ -56,9 +56,10 @@ def initialize(options = {}) # resp.data #=> Types::CustomAuthOutput def custom_auth(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::CustomAuthInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::CustomAuth.build(config) + stack = WhiteLabel::Middleware::CustomAuth.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -88,9 +89,10 @@ def custom_auth(params = {}, options = {}) # resp.data #=> Types::DataplaneEndpointOutput def dataplane_endpoint(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::DataplaneEndpointInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::DataplaneEndpoint.build(config) + stack = WhiteLabel::Middleware::DataplaneEndpoint.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -174,9 +176,10 @@ def dataplane_endpoint(params = {}, options = {}) # resp.data.epoch_timestamp #=> Time def defaults_test(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::DefaultsTestInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::DefaultsTest.build(config) + stack = WhiteLabel::Middleware::DefaultsTest.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -206,9 +209,10 @@ def defaults_test(params = {}, options = {}) # resp.data #=> Types::EndpointOperationOutput def endpoint_operation(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::EndpointOperationInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::EndpointOperation.build(config) + stack = WhiteLabel::Middleware::EndpointOperation.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -240,9 +244,10 @@ def endpoint_operation(params = {}, options = {}) # resp.data #=> Types::EndpointWithHostLabelOperationOutput def endpoint_with_host_label_operation(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::EndpointWithHostLabelOperationInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::EndpointWithHostLabelOperation.build(config) + stack = WhiteLabel::Middleware::EndpointWithHostLabelOperation.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -272,9 +277,10 @@ def endpoint_with_host_label_operation(params = {}, options = {}) # resp.data #=> Types::HttpApiKeyAuthOutput def http_api_key_auth(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpApiKeyAuthInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::HttpApiKeyAuth.build(config) + stack = WhiteLabel::Middleware::HttpApiKeyAuth.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -304,9 +310,10 @@ def http_api_key_auth(params = {}, options = {}) # resp.data #=> Types::HttpBasicAuthOutput def http_basic_auth(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpBasicAuthInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::HttpBasicAuth.build(config) + stack = WhiteLabel::Middleware::HttpBasicAuth.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -336,9 +343,10 @@ def http_basic_auth(params = {}, options = {}) # resp.data #=> Types::HttpBearerAuthOutput def http_bearer_auth(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpBearerAuthInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::HttpBearerAuth.build(config) + stack = WhiteLabel::Middleware::HttpBearerAuth.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -368,9 +376,10 @@ def http_bearer_auth(params = {}, options = {}) # resp.data #=> Types::HttpDigestAuthOutput def http_digest_auth(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::HttpDigestAuthInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::HttpDigestAuth.build(config) + stack = WhiteLabel::Middleware::HttpDigestAuth.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -542,9 +551,10 @@ def http_digest_auth(params = {}, options = {}) # } def kitchen_sink(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::KitchenSinkInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::KitchenSink.build(config) + stack = WhiteLabel::Middleware::KitchenSink.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -578,9 +588,10 @@ def kitchen_sink(params = {}, options = {}) # resp.data.user_id #=> String def mixin_test(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::MixinTestInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::MixinTest.build(config) + stack = WhiteLabel::Middleware::MixinTest.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -610,9 +621,10 @@ def mixin_test(params = {}, options = {}) # resp.data #=> Types::NoAuthOutput def no_auth(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::NoAuthInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::NoAuth.build(config) + stack = WhiteLabel::Middleware::NoAuth.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -642,9 +654,10 @@ def no_auth(params = {}, options = {}) # resp.data #=> Types::OptionalAuthOutput def optional_auth(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::OptionalAuthInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::OptionalAuth.build(config) + stack = WhiteLabel::Middleware::OptionalAuth.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -674,9 +687,10 @@ def optional_auth(params = {}, options = {}) # resp.data #=> Types::OrderedAuthOutput def ordered_auth(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::OrderedAuthInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::OrderedAuth.build(config) + stack = WhiteLabel::Middleware::OrderedAuth.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -711,9 +725,10 @@ def ordered_auth(params = {}, options = {}) # resp.data.items[0] #=> String def paginators_test(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::PaginatorsTestOperationInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::PaginatorsTest.build(config) + stack = WhiteLabel::Middleware::PaginatorsTest.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -748,9 +763,10 @@ def paginators_test(params = {}, options = {}) # resp.data.items[0] #=> String def paginators_test_with_items(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::PaginatorsTestWithItemsInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::PaginatorsTestWithItems.build(config) + stack = WhiteLabel::Middleware::PaginatorsTestWithItems.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -780,9 +796,10 @@ def paginators_test_with_items(params = {}, options = {}) # resp.data #=> Types::RelativeMiddlewareOutput def relative_middleware(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::RelativeMiddlewareInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::RelativeMiddleware.build(config) + stack = WhiteLabel::Middleware::RelativeMiddleware.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -814,9 +831,10 @@ def relative_middleware(params = {}, options = {}) # resp.data #=> Types::RequestCompressionOutput def request_compression(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::RequestCompressionInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::RequestCompression.build(config) + stack = WhiteLabel::Middleware::RequestCompression.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -848,9 +866,10 @@ def request_compression(params = {}, options = {}) # resp.data #=> Types::RequestCompressionStreamingOutput def request_compression_streaming(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::RequestCompressionStreamingInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::RequestCompressionStreaming.build(config) + stack = WhiteLabel::Middleware::RequestCompressionStreaming.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -882,9 +901,10 @@ def request_compression_streaming(params = {}, options = {}) # resp.data #=> Types::ResourceEndpointOutput def resource_endpoint(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::ResourceEndpointInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::ResourceEndpoint.build(config) + stack = WhiteLabel::Middleware::ResourceEndpoint.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -901,6 +921,79 @@ def resource_endpoint(params = {}, options = {}) output end + # @param [Hash | Types::StartEventStreamInput] params + # Request parameters for this operation. + # See {Types::StartEventStreamInput#initialize} for available parameters. + # Do not set values for the event stream member +event+. + # Instead use the returned output to signal input events. + # @param [Hash] options + # Request option override of configuration. See {Config#initialize} for available options. + # Some configurations cannot be overridden. + # @option options [EventStream::StartEventStreamHandler] :event_stream_handler + # Event Stream Handler used to register handlers that will be called when events are received. + # @return [EventStream::StartEventStreamOutput] + # An open stream that supports sending (signaling) input events to the service. + # @example Request syntax with placeholder values + # resp = client.start_event_stream( + # event: { + # # One of: + # simple_event: { + # message: 'message' + # }, + # nested_event: { + # nested: { + # values: [ + # 'member' + # ] + # } + # }, + # explicit_payload_event: { + # header_a: 'headerA', + # } + # }, + # initial_structure: { + # message: 'message', + # } + # ) + # @example Response structure + # resp.data #=> Types::StartEventStreamOutput + # resp.data.event #=> Types::Events, one of [SimpleEvent, NestedEvent, ExplicitPayloadEvent] + # resp.data.event.simple_event #=> Types::SimpleEvent + # resp.data.event.simple_event.message #=> String + # resp.data.event.nested_event #=> Types::NestedEvent + # resp.data.event.nested_event.nested #=> Types::NestedStructure + # resp.data.event.nested_event.nested.values #=> Array + # resp.data.event.nested_event.nested.values[0] #=> String + # resp.data.event.explicit_payload_event #=> Types::ExplicitPayloadEvent + # resp.data.event.explicit_payload_event.header_a #=> String + # resp.data.event.explicit_payload_event.payload #=> Types::NestedStructure + # resp.data.initial_structure #=> Types::InitialStructure + # resp.data.initial_structure.message #=> String + # resp.data.initial_structure.nested #=> Types::NestedStructure + def start_event_stream(params = {}, options = {}) + response_body = ::StringIO.new + middleware_opts = {} + middleware_opts[:event_stream_handler] = options.delete(:event_stream_handler) + raise ArgumentError, 'Missing `event_stream_handler`' unless middleware_opts[:event_stream_handler] + config = operation_config(options) + input = Params::StartEventStreamInput.build(params, context: 'params') + stack = WhiteLabel::Middleware::StartEventStream.build(config, middleware_opts) + context = Hearth::Context.new( + request: Hearth::HTTP2::Request.new(uri: URI('')), + response: Hearth::HTTP2::Response.new(body: response_body), + config: config, + operation_name: :start_event_stream, + ) + context.config.logger.info("[#{context.invocation_id}] [#{self.class}#start_event_stream] params: #{params}, options: #{options}") + output = stack.run(input, context) + if output.error + context.config.logger.error("[#{context.invocation_id}] [#{self.class}#start_event_stream] #{output.error} (#{output.error.class})") + raise output.error + end + context.config.logger.info("[#{context.invocation_id}] [#{self.class}#start_event_stream] #{output.data}") + output + end + # @param [Hash | Types::StreamingInput] params # Request parameters for this operation. # See {Types::StreamingInput#initialize} for available parameters. @@ -917,9 +1010,10 @@ def resource_endpoint(params = {}, options = {}) # resp.data.stream #=> IO def streaming(params = {}, options = {}, &block) response_body = output_stream(options, &block) + middleware_opts = {} config = operation_config(options) input = Params::StreamingInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::Streaming.build(config) + stack = WhiteLabel::Middleware::Streaming.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -951,9 +1045,10 @@ def streaming(params = {}, options = {}, &block) # resp.data #=> Types::StreamingWithLengthOutput def streaming_with_length(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::StreamingWithLengthInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::StreamingWithLength.build(config) + stack = WhiteLabel::Middleware::StreamingWithLength.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -986,9 +1081,10 @@ def streaming_with_length(params = {}, options = {}) # resp.data.status #=> String def waiters_test(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::WaitersTestInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::WaitersTest.build(config) + stack = WhiteLabel::Middleware::WaitersTest.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1024,9 +1120,10 @@ def waiters_test(params = {}, options = {}) # resp.data.member___items[0] #=> String def operation____paginators_test_with_bad_names(params = {}, options = {}) response_body = ::StringIO.new + middleware_opts = {} config = operation_config(options) input = Params::Struct____PaginatorsTestWithBadNamesInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::Operation____PaginatorsTestWithBadNames.build(config) + stack = WhiteLabel::Middleware::Operation____PaginatorsTestWithBadNames.build(config, middleware_opts) context = Hearth::Context.new( request: Hearth::HTTP::Request.new(uri: URI('')), response: Hearth::HTTP::Response.new(body: response_body), @@ -1042,78 +1139,5 @@ def operation____paginators_test_with_bad_names(params = {}, options = {}) context.config.logger.info("[#{context.invocation_id}] [#{self.class}#operation____paginators_test_with_bad_names] #{output.data}") output end - - # @param [Hash | Types::StartEventStreamInput] params - # Request parameters for this operation. - # See {Types::StartEventStreamInput#initialize} for available parameters. - # Do not set values for the event stream member +event+. - # Instead use the returned output to signal input events. - # @param [Hash] options - # Request option override of configuration. See {Config#initialize} for available options. - # Some configurations cannot be overridden. - # @option options [EventStream::StartEventStreamHandler] :event_stream_handler - # Event Stream Handler used to register handlers that will be called when events are received. - # @return [EventStream::StartEventStreamOutput] - # An open stream that supports sending (signaling) input events to the service. - # @example Request syntax with placeholder values - # resp = client.start_event_stream( - # event: { - # # One of: - # simple_event: { - # message: 'message' - # }, - # nested_event: { - # nested: { - # values: [ - # 'member' - # ] - # } - # }, - # explicit_payload_event: { - # header_a: 'headerA', - # } - # }, - # initial_structure: { - # message: 'message', - # } - # ) - # @example Response structure - # resp.data #=> Types::StartEventStreamOutput - # resp.data.event #=> Types::Events, one of [SimpleEvent, NestedEvent, ExplicitPayloadEvent] - # resp.data.event.simple_event #=> Types::SimpleEvent - # resp.data.event.simple_event.message #=> String - # resp.data.event.nested_event #=> Types::NestedEvent - # resp.data.event.nested_event.nested #=> Types::NestedStructure - # resp.data.event.nested_event.nested.values #=> Array - # resp.data.event.nested_event.nested.values[0] #=> String - # resp.data.event.explicit_payload_event #=> Types::ExplicitPayloadEvent - # resp.data.event.explicit_payload_event.header_a #=> String - # resp.data.event.explicit_payload_event.payload #=> Types::NestedStructure - # resp.data.initial_structure #=> Types::InitialStructure - # resp.data.initial_structure.message #=> String - # resp.data.initial_structure.nested #=> Types::NestedStructure - def start_event_stream(params = {}, options = {}) - middleware_opts = {} - middleware_opts[:event_stream_handler] = options.delete(:event_stream_handler) - raise ArgumentError, 'Missing `event_stream_handler`' unless middleware_opts[:event_stream_handler] - response_body = ::StringIO.new - config = operation_config(options) - input = Params::StartEventStreamInput.build(params, context: 'params') - stack = WhiteLabel::Middleware::StartEventStream.build(config, middleware_opts) - context = Hearth::Context.new( - request: Hearth::HTTP2::Request.new(uri: URI('')), - response: Hearth::HTTP2::Response.new(body: response_body), - config: config, - operation_name: :start_event_stream, - ) - context.config.logger.info("[#{context.invocation_id}] [#{self.class}#start_event_stream] params: #{params}, options: #{options}") - output = stack.run(input, context) - if output.error - context.config.logger.error("[#{context.invocation_id}] [#{self.class}#start_event_stream] #{output.error} (#{output.error.class})") - raise output.error - end - context.config.logger.info("[#{context.invocation_id}] [#{self.class}#start_event_stream] #{output.data}") - output - end end end diff --git a/codegen/projections/white_label/lib/white_label/middleware.rb b/codegen/projections/white_label/lib/white_label/middleware.rb index f664a96f7..10ea1d24b 100644 --- a/codegen/projections/white_label/lib/white_label/middleware.rb +++ b/codegen/projections/white_label/lib/white_label/middleware.rb @@ -15,7 +15,7 @@ module WhiteLabel module Middleware class CustomAuth - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -69,7 +69,7 @@ def self.build(config, options={}) end class DataplaneEndpoint - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -123,7 +123,7 @@ def self.build(config, options={}) end class DefaultsTest - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -177,7 +177,7 @@ def self.build(config, options={}) end class EndpointOperation - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -235,7 +235,7 @@ def self.build(config, options={}) end class EndpointWithHostLabelOperation - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -293,7 +293,7 @@ def self.build(config, options={}) end class HttpApiKeyAuth - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -347,7 +347,7 @@ def self.build(config, options={}) end class HttpBasicAuth - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -401,7 +401,7 @@ def self.build(config, options={}) end class HttpBearerAuth - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -455,7 +455,7 @@ def self.build(config, options={}) end class HttpDigestAuth - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -509,7 +509,7 @@ def self.build(config, options={}) end class KitchenSink - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -563,7 +563,7 @@ def self.build(config, options={}) end class MixinTest - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -617,7 +617,7 @@ def self.build(config, options={}) end class NoAuth - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -671,7 +671,7 @@ def self.build(config, options={}) end class OptionalAuth - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -725,7 +725,7 @@ def self.build(config, options={}) end class OrderedAuth - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -779,7 +779,7 @@ def self.build(config, options={}) end class PaginatorsTest - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -833,7 +833,7 @@ def self.build(config, options={}) end class PaginatorsTestWithItems - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -887,7 +887,7 @@ def self.build(config, options={}) end class RelativeMiddleware - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -944,7 +944,7 @@ def self.build(config, options={}) end class RequestCompression - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -1005,7 +1005,7 @@ def self.build(config, options={}) end class RequestCompressionStreaming - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -1064,7 +1064,7 @@ def self.build(config, options={}) end class ResourceEndpoint - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -1118,7 +1118,7 @@ def self.build(config, options={}) end class StartEventStream - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -1170,7 +1170,7 @@ def self.build(config, options={}) end class Streaming - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -1223,7 +1223,7 @@ def self.build(config, options={}) end class StreamingWithLength - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -1277,7 +1277,7 @@ def self.build(config, options={}) end class WaitersTest - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, @@ -1331,7 +1331,7 @@ def self.build(config, options={}) end class Operation____PaginatorsTestWithBadNames - def self.build(config, options={}) + def self.build(config, options = {}) stack = Hearth::MiddlewareStack.new stack.use(Hearth::Middleware::Initialize) stack.use(Middleware::TestMiddleware, diff --git a/codegen/smithy-ruby-codegen/src/main/java/software/amazon/smithy/ruby/codegen/generators/ClientGenerator.java b/codegen/smithy-ruby-codegen/src/main/java/software/amazon/smithy/ruby/codegen/generators/ClientGenerator.java index cf6727827..93ea10e51 100644 --- a/codegen/smithy-ruby-codegen/src/main/java/software/amazon/smithy/ruby/codegen/generators/ClientGenerator.java +++ b/codegen/smithy-ruby-codegen/src/main/java/software/amazon/smithy/ruby/codegen/generators/ClientGenerator.java @@ -20,6 +20,7 @@ import java.util.Set; import java.util.logging.Logger; import java.util.stream.Collectors; +import software.amazon.smithy.build.SmithyBuildException; import software.amazon.smithy.codegen.core.directed.GenerateServiceDirective; import software.amazon.smithy.model.shapes.OperationShape; import software.amazon.smithy.model.shapes.Shape; @@ -52,7 +53,7 @@ public class ClientGenerator extends RubyGeneratorBase { private final List clientConfigList; public ClientGenerator(GenerateServiceDirective directive, - List clientConfigList) { + List clientConfigList) { super(directive); this.operations = directive.operations(); this.runtimePlugins = context.getRuntimePlugins(); @@ -69,11 +70,11 @@ protected String getModule() { */ public void render() { List additionalFiles = runtimePlugins.stream() - .map(plugin -> plugin.writeAdditionalFiles(context)) - .flatMap(List::stream) - .distinct() - .sorted() - .collect(Collectors.toList()); + .map(plugin -> plugin.writeAdditionalFiles(context)) + .flatMap(List::stream) + .distinct() + .sorted() + .collect(Collectors.toList()); additionalFiles.sort(String::compareTo); write(writer -> { @@ -165,17 +166,8 @@ private void renderInitializeMethod(RubyCodeWriter writer) { private void renderOperations(RubyCodeWriter writer) { operations.stream() - .filter((o) -> !Streaming.isEventStreaming(model, o)) .sorted(Comparator.comparing((o) -> o.getId().getName())) .forEach(o -> renderOperation(writer, o)); - - context.eventStreamTransport().ifPresent(eventStreamTransport -> { - operations.stream() - .filter((o) -> Streaming.isEventStreaming(model, o)) - .sorted(Comparator.comparing((o) -> o.getId().getName())) - .forEach(o -> renderEventStreamOperation(writer, eventStreamTransport, o)); - }); - } private void renderRbsOperations(RubyCodeWriter writer) { @@ -198,12 +190,14 @@ private void renderOperation(RubyCodeWriter writer, OperationShape operation) { String classOperationName = symbolProvider.toSymbol(operation).getName(); String operationName = RubyFormatter.toSnakeCase(classOperationName); boolean isStreaming = Streaming.isStreaming(model, outputShape); + boolean isEventStreaming = Streaming.isEventStreaming(model, operation); + boolean isOutputEventStreaming = Streaming.isEventStreaming(model, outputShape); writer .write("") .call(() -> new ShapeDocumentationGenerator(context, writer, symbolProvider, operation).render()) .call(() -> { - if (isStreaming) { + if (isStreaming && !isEventStreaming) { writer .openBlock("def $L(params = {}, options = {}, &block)", operationName) .write("response_body = output_stream(options, &block)"); @@ -213,62 +207,47 @@ private void renderOperation(RubyCodeWriter writer, OperationShape operation) { .write("response_body = $T.new", RubyImportContainer.STRING_IO); } }) - .write("config = operation_config(options)") - .write("input = Params::$L.build(params, context: 'params')", - symbolProvider.toSymbol(inputShape).getName()) - .write("stack = $L::Middleware::$L.build(config)", - settings.getModule(), classOperationName) - .openBlock("context = $T.new(", Hearth.CONTEXT) - .write("request: $L,", - context.applicationTransport().getRequest() - .render(context)) - .write("response: $L,", - context.applicationTransport().getResponse() - .render(context)) - .write("config: config,") - .write("operation_name: :$L,", operationName) - .closeBlock(")") - .write("context.config.logger.info(\"[#{context.invocation_id}] [#{self.class}#$L] params: #{params}, " - + "options: #{options}\")", operationName) - .write("output = stack.run(input, context)") - .openBlock("if output.error") - .write("context.config.logger.error(\"[#{context.invocation_id}] [#{self.class}#$L] #{output.error} " - + "(#{output.error.class})\")", operationName) - .write("raise output.error") - .closeBlock("end") - .write("context.config.logger.info(\"[#{context.invocation_id}] [#{self.class}#$L] #{output.data}\")", - operationName) - .write("output") - .closeBlock("end"); - } - - private void renderEventStreamOperation( - RubyCodeWriter writer, ApplicationTransport eventStreamTransport, OperationShape operation) { - Shape inputShape = model.expectShape(operation.getInputShape()); - String classOperationName = symbolProvider.toSymbol(operation).getName(); - String operationName = RubyFormatter.toSnakeCase(classOperationName); - - writer - .write("") - .call(() -> new ShapeDocumentationGenerator(context, writer, symbolProvider, operation).render()) - .openBlock("def $L(params = {}, options = {})", operationName) .write("middleware_opts = {}") - .write("middleware_opts[:event_stream_handler] = options.delete(:event_stream_handler)") - .write("raise ArgumentError, 'Missing `event_stream_handler`' " - + "unless middleware_opts[:event_stream_handler]") - .write("response_body = $T.new", RubyImportContainer.STRING_IO) + .call(() -> { + if (isOutputEventStreaming) { + writer + .write("middleware_opts[:event_stream_handler] = " + + "options.delete(:event_stream_handler)") + .write("raise ArgumentError, 'Missing `event_stream_handler`' " + + "unless middleware_opts[:event_stream_handler]"); + } + }) + .write("config = operation_config(options)") .write("input = Params::$L.build(params, context: 'params')", symbolProvider.toSymbol(inputShape).getName()) .write("stack = $L::Middleware::$L.build(config, middleware_opts)", settings.getModule(), classOperationName) .openBlock("context = $T.new(", Hearth.CONTEXT) - .write("request: $L,", - eventStreamTransport.getRequest() - .render(context)) - .write("response: $L,", - eventStreamTransport.getResponse() - .render(context)) + .call(() -> { + if (isEventStreaming) { + ApplicationTransport eventStreamTransport = + context.eventStreamTransport().orElseThrow(() -> { + return new SmithyBuildException("EventStream Transport must be defined."); + }); + writer + .write("request: $L,", + eventStreamTransport.getRequest() + .render(context)) + .write("response: $L,", + eventStreamTransport.getResponse() + .render(context)); + } else { + writer + .write("request: $L,", + context.applicationTransport().getRequest() + .render(context)) + .write("response: $L,", + context.applicationTransport().getResponse() + .render(context)); + } + }) + .write("config: config,") .write("operation_name: :$L,", operationName) .closeBlock(")") diff --git a/codegen/smithy-ruby-codegen/src/main/java/software/amazon/smithy/ruby/codegen/generators/MiddlewareGenerator.java b/codegen/smithy-ruby-codegen/src/main/java/software/amazon/smithy/ruby/codegen/generators/MiddlewareGenerator.java index a2bba5e87..47db0a35e 100644 --- a/codegen/smithy-ruby-codegen/src/main/java/software/amazon/smithy/ruby/codegen/generators/MiddlewareGenerator.java +++ b/codegen/smithy-ruby-codegen/src/main/java/software/amazon/smithy/ruby/codegen/generators/MiddlewareGenerator.java @@ -88,7 +88,7 @@ private void renderOperation(RubyCodeWriter writer, OperationShape operation) { writer .write("") .openBlock("class $L", operationName) - .openBlock("def self.build(config, options={})") + .openBlock("def self.build(config, options = {})") .write("stack = $T.new", Hearth.MIDDLEWARE_STACK) .call(() -> middlewareBuilder.render(writer, context, operation)) .write("stack")