From b9c8c708c5508713acd1d3d63e9c28d8884be33b Mon Sep 17 00:00:00 2001
From: Yuki Yugui Sonoda <yugui@yugui.jp>
Date: Mon, 30 Apr 2018 20:28:02 +0900
Subject: [PATCH 1/7] Add more tests for nested fields in path parameters

---
 .../a_bit_of_everything_service.spec.js       |   3 +-
 .../clients/abe/a_bit_of_everything_nested.go |   3 +-
 .../abe/a_bit_of_everything_service_api.go    | 169 ++++++++-
 .../abe/examplepb_a_bit_of_everything.go      |   4 +-
 examples/integration/client_test.go           |   2 +-
 examples/integration/integration_test.go      |  66 +++-
 .../proto/examplepb/a_bit_of_everything.pb.go | 352 +++++++++---------
 .../examplepb/a_bit_of_everything.pb.gw.go    | 116 +++++-
 .../proto/examplepb/a_bit_of_everything.proto |  23 +-
 .../a_bit_of_everything.swagger.json          | 107 +++++-
 runtime/marshal_json_test.go                  |   2 +-
 runtime/marshal_jsonpb_test.go                |  28 +-
 runtime/marshal_proto_test.go                 |   4 +-
 13 files changed, 666 insertions(+), 213 deletions(-)

diff --git a/examples/browser/a_bit_of_everything_service.spec.js b/examples/browser/a_bit_of_everything_service.spec.js
index edcbebe11d6..439a35af45e 100644
--- a/examples/browser/a_bit_of_everything_service.spec.js
+++ b/examples/browser/a_bit_of_everything_service.spec.js
@@ -33,6 +33,7 @@ describe('ABitOfEverythingService', function() {
       sfixed64_value: "-4611686018427387904",
       sint32_value: 2147483647,
       sint64_value: "4611686018427387903",
+      oneof_value_string: "foo",
       nonConventionalNameValue: "camelCase",
     };
 
@@ -78,7 +79,7 @@ describe('ABitOfEverythingService', function() {
        { name: "baz", amount: 20 },
       ],
       repeated_string_value: ["a", "b", "c"],
-      oneof_string: "x",
+      oneof_value_string: "x",
       // TODO(yugui) Support enum by name
       map_value: { a: 1, b: 2 },
       mapped_string_value: { a: "x", b: "y" },
diff --git a/examples/clients/abe/a_bit_of_everything_nested.go b/examples/clients/abe/a_bit_of_everything_nested.go
index 095e8c5f118..70433451211 100644
--- a/examples/clients/abe/a_bit_of_everything_nested.go
+++ b/examples/clients/abe/a_bit_of_everything_nested.go
@@ -10,7 +10,6 @@
 
 package abe
 
-// Nested is nested type.
 type ABitOfEverythingNested struct {
 
 	// name is nested field.
@@ -19,4 +18,6 @@ type ABitOfEverythingNested struct {
 	Amount int64 `json:"amount,omitempty"`
 
 	Ok NestedDeepEnum `json:"ok,omitempty"`
+
+	DeeperNestedValue SubStringMessage `json:"deeper_nested_value,omitempty"`
 }
diff --git a/examples/clients/abe/a_bit_of_everything_service_api.go b/examples/clients/abe/a_bit_of_everything_service_api.go
index 19c6fdaa7dd..180c6b18b4d 100644
--- a/examples/clients/abe/a_bit_of_everything_service_api.go
+++ b/examples/clients/abe/a_bit_of_everything_service_api.go
@@ -215,6 +215,78 @@ func (a ABitOfEverythingServiceApi) CreateBody(body ExamplepbABitOfEverything) (
 	return successPayload, localVarAPIResponse, err
 }
 
+/**
+ * 
+ *
+ * @return *ExamplepbABitOfEverything
+ */
+func (a ABitOfEverythingServiceApi) DeepPathEcho() (*ExamplepbABitOfEverything, *APIResponse, error) {
+
+	var localVarHttpMethod = strings.ToUpper("Post")
+	// create path and map variables
+	localVarPath := a.Configuration.BasePath + "/v1/example/a_bit_of_everything;echo"
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := url.Values{}
+	localVarFormParams := make(map[string]string)
+	var localVarPostBody interface{}
+	var localVarFileName string
+	var localVarFileBytes []byte
+	// authentication '(OAuth2)' required
+	// oauth required
+	if a.Configuration.AccessToken != ""{
+		localVarHeaderParams["Authorization"] =  "Bearer " + a.Configuration.AccessToken
+	}
+	// authentication '(BasicAuth)' required
+	// http basic authentication required
+	if a.Configuration.Username != "" || a.Configuration.Password != ""{
+		localVarHeaderParams["Authorization"] =  "Basic " + a.Configuration.GetBasicAuthEncodedString()
+	}
+	// authentication '(ApiKeyAuth)' required
+	// set key with prefix in header
+	localVarHeaderParams["X-API-Key"] = a.Configuration.GetAPIKeyWithPrefix("X-API-Key")
+	// add default headers if any
+	for key := range a.Configuration.DefaultHeader {
+		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
+	}
+
+	// to determine the Content-Type header
+	localVarHttpContentTypes := []string{ "application/json", "application/x-foo-mime",  }
+
+	// set Content-Type header
+	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
+	if localVarHttpContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHttpContentType
+	}
+	// to determine the Accept header
+	localVarHttpHeaderAccepts := []string{
+		"application/json",
+		"application/x-foo-mime",
+		}
+
+	// set Accept header
+	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+	if localVarHttpHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
+	}
+	var successPayload = new(ExamplepbABitOfEverything)
+	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
+
+	var localVarURL, _ = url.Parse(localVarPath)
+	localVarURL.RawQuery = localVarQueryParams.Encode()
+	var localVarAPIResponse = &APIResponse{Operation: "DeepPathEcho", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
+	if localVarHttpResponse != nil {
+		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
+		localVarAPIResponse.Payload = localVarHttpResponse.Body()
+	}
+
+	if err != nil {
+		return successPayload, localVarAPIResponse, err
+	}
+	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
+	return successPayload, localVarAPIResponse, err
+}
+
 /**
  * 
  *
@@ -222,7 +294,7 @@ func (a ABitOfEverythingServiceApi) CreateBody(body ExamplepbABitOfEverything) (
  * @param body 
  * @return *ExamplepbABitOfEverything
  */
-func (a ABitOfEverythingServiceApi) DeepPathEcho(singleNestedName string, body ExamplepbABitOfEverything) (*ExamplepbABitOfEverything, *APIResponse, error) {
+func (a ABitOfEverythingServiceApi) DeepPathEcho2(singleNestedName string, body ExamplepbABitOfEverything) (*ExamplepbABitOfEverything, *APIResponse, error) {
 
 	var localVarHttpMethod = strings.ToUpper("Post")
 	// create path and map variables
@@ -279,7 +351,84 @@ func (a ABitOfEverythingServiceApi) DeepPathEcho(singleNestedName string, body E
 
 	var localVarURL, _ = url.Parse(localVarPath)
 	localVarURL.RawQuery = localVarQueryParams.Encode()
-	var localVarAPIResponse = &APIResponse{Operation: "DeepPathEcho", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
+	var localVarAPIResponse = &APIResponse{Operation: "DeepPathEcho2", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
+	if localVarHttpResponse != nil {
+		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
+		localVarAPIResponse.Payload = localVarHttpResponse.Body()
+	}
+
+	if err != nil {
+		return successPayload, localVarAPIResponse, err
+	}
+	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
+	return successPayload, localVarAPIResponse, err
+}
+
+/**
+ * 
+ *
+ * @param singleNestedDeeperNestedValueValue 
+ * @param body 
+ * @return *ExamplepbABitOfEverything
+ */
+func (a ABitOfEverythingServiceApi) DeepPathEcho3(singleNestedDeeperNestedValueValue string, body ExamplepbABitOfEverything) (*ExamplepbABitOfEverything, *APIResponse, error) {
+
+	var localVarHttpMethod = strings.ToUpper("Post")
+	// create path and map variables
+	localVarPath := a.Configuration.BasePath + "/v2/example/single_nested/deeper_nested_value/{single_nested.deeper_nested_value.value}"
+	localVarPath = strings.Replace(localVarPath, "{"+"single_nested.deeper_nested_value.value"+"}", fmt.Sprintf("%v", singleNestedDeeperNestedValueValue), -1)
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := url.Values{}
+	localVarFormParams := make(map[string]string)
+	var localVarPostBody interface{}
+	var localVarFileName string
+	var localVarFileBytes []byte
+	// authentication '(OAuth2)' required
+	// oauth required
+	if a.Configuration.AccessToken != ""{
+		localVarHeaderParams["Authorization"] =  "Bearer " + a.Configuration.AccessToken
+	}
+	// authentication '(BasicAuth)' required
+	// http basic authentication required
+	if a.Configuration.Username != "" || a.Configuration.Password != ""{
+		localVarHeaderParams["Authorization"] =  "Basic " + a.Configuration.GetBasicAuthEncodedString()
+	}
+	// authentication '(ApiKeyAuth)' required
+	// set key with prefix in header
+	localVarHeaderParams["X-API-Key"] = a.Configuration.GetAPIKeyWithPrefix("X-API-Key")
+	// add default headers if any
+	for key := range a.Configuration.DefaultHeader {
+		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
+	}
+
+	// to determine the Content-Type header
+	localVarHttpContentTypes := []string{ "application/json", "application/x-foo-mime",  }
+
+	// set Content-Type header
+	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
+	if localVarHttpContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHttpContentType
+	}
+	// to determine the Accept header
+	localVarHttpHeaderAccepts := []string{
+		"application/json",
+		"application/x-foo-mime",
+		}
+
+	// set Accept header
+	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+	if localVarHttpHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
+	}
+	// body params
+	localVarPostBody = &body
+	var successPayload = new(ExamplepbABitOfEverything)
+	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
+
+	var localVarURL, _ = url.Parse(localVarPath)
+	localVarURL.RawQuery = localVarQueryParams.Encode()
+	var localVarAPIResponse = &APIResponse{Operation: "DeepPathEcho3", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
 	if localVarHttpResponse != nil {
 		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
 		localVarAPIResponse.Payload = localVarHttpResponse.Body()
@@ -517,6 +666,7 @@ func (a ABitOfEverythingServiceApi) GetMessageWithBody(id string, body Examplepb
  * @param singleNestedName name is nested field.
  * @param singleNestedAmount 
  * @param singleNestedOk  - FALSE: FALSE is false.  - TRUE: TRUE is true.
+ * @param singleNestedDeeperNestedValueValue 
  * @param floatValue 
  * @param doubleValue 
  * @param int64Value 
@@ -534,13 +684,17 @@ func (a ABitOfEverythingServiceApi) GetMessageWithBody(id string, body Examplepb
  * @param sint32Value 
  * @param sint64Value 
  * @param repeatedStringValue 
- * @param oneofString 
+ * @param oneofValueString tag 20 is reserved.
+ * @param oneofValueNestedName name is nested field.
+ * @param oneofValueNestedAmount 
+ * @param oneofValueNestedOk  - FALSE: FALSE is false.  - TRUE: TRUE is true.
+ * @param oneofValueNestedDeeperNestedValueValue 
  * @param nonConventionalNameValue 
  * @param timestampValue 
  * @param repeatedEnumValue repeated enum value. it is comma-separated in query.   - ZERO: ZERO means 0  - ONE: ONE means 1
  * @return *ProtobufEmpty
  */
-func (a ABitOfEverythingServiceApi) GetQuery(uuid string, singleNestedName string, singleNestedAmount int64, singleNestedOk string, floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, stringValue string, bytesValue string, uint32Value int64, enumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofString string, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string) (*ProtobufEmpty, *APIResponse, error) {
+func (a ABitOfEverythingServiceApi) GetQuery(uuid string, singleNestedName string, singleNestedAmount int64, singleNestedOk string, singleNestedDeeperNestedValueValue string, floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, stringValue string, bytesValue string, uint32Value int64, enumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofValueString string, oneofValueNestedName string, oneofValueNestedAmount int64, oneofValueNestedOk string, oneofValueNestedDeeperNestedValueValue string, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string) (*ProtobufEmpty, *APIResponse, error) {
 
 	var localVarHttpMethod = strings.ToUpper("Get")
 	// create path and map variables
@@ -573,6 +727,7 @@ func (a ABitOfEverythingServiceApi) GetQuery(uuid string, singleNestedName strin
 	localVarQueryParams.Add("single_nested.name", a.Configuration.APIClient.ParameterToString(singleNestedName, ""))
 	localVarQueryParams.Add("single_nested.amount", a.Configuration.APIClient.ParameterToString(singleNestedAmount, ""))
 	localVarQueryParams.Add("single_nested.ok", a.Configuration.APIClient.ParameterToString(singleNestedOk, ""))
+	localVarQueryParams.Add("single_nested.deeper_nested_value.value", a.Configuration.APIClient.ParameterToString(singleNestedDeeperNestedValueValue, ""))
 	localVarQueryParams.Add("float_value", a.Configuration.APIClient.ParameterToString(floatValue, ""))
 	localVarQueryParams.Add("double_value", a.Configuration.APIClient.ParameterToString(doubleValue, ""))
 	localVarQueryParams.Add("int64_value", a.Configuration.APIClient.ParameterToString(int64Value, ""))
@@ -592,7 +747,11 @@ func (a ABitOfEverythingServiceApi) GetQuery(uuid string, singleNestedName strin
 	var repeatedStringValueCollectionFormat = "csv"
 	localVarQueryParams.Add("repeated_string_value", a.Configuration.APIClient.ParameterToString(repeatedStringValue, repeatedStringValueCollectionFormat))
 
-	localVarQueryParams.Add("oneof_string", a.Configuration.APIClient.ParameterToString(oneofString, ""))
+	localVarQueryParams.Add("oneof_value_string", a.Configuration.APIClient.ParameterToString(oneofValueString, ""))
+	localVarQueryParams.Add("oneof_value_nested.name", a.Configuration.APIClient.ParameterToString(oneofValueNestedName, ""))
+	localVarQueryParams.Add("oneof_value_nested.amount", a.Configuration.APIClient.ParameterToString(oneofValueNestedAmount, ""))
+	localVarQueryParams.Add("oneof_value_nested.ok", a.Configuration.APIClient.ParameterToString(oneofValueNestedOk, ""))
+	localVarQueryParams.Add("oneof_value_nested.deeper_nested_value.value", a.Configuration.APIClient.ParameterToString(oneofValueNestedDeeperNestedValueValue, ""))
 	localVarQueryParams.Add("nonConventionalNameValue", a.Configuration.APIClient.ParameterToString(nonConventionalNameValue, ""))
 	localVarQueryParams.Add("timestamp_value", a.Configuration.APIClient.ParameterToString(timestampValue, ""))
 	var repeatedEnumValueCollectionFormat = "csv"
diff --git a/examples/clients/abe/examplepb_a_bit_of_everything.go b/examples/clients/abe/examplepb_a_bit_of_everything.go
index cb6fb3a487d..394887fa3e9 100644
--- a/examples/clients/abe/examplepb_a_bit_of_everything.go
+++ b/examples/clients/abe/examplepb_a_bit_of_everything.go
@@ -56,9 +56,9 @@ type ExamplepbABitOfEverything struct {
 
 	RepeatedStringValue []string `json:"repeated_string_value,omitempty"`
 
-	OneofEmpty ProtobufEmpty `json:"oneof_empty,omitempty"`
+	OneofValueString string `json:"oneof_value_string,omitempty"`
 
-	OneofString string `json:"oneof_string,omitempty"`
+	OneofValueNested ABitOfEverythingNested `json:"oneof_value_nested,omitempty"`
 
 	MapValue map[string]ExamplepbNumericEnum `json:"map_value,omitempty"`
 
diff --git a/examples/integration/client_test.go b/examples/integration/client_test.go
index b49a2f31fff..8850d58eaac 100644
--- a/examples/integration/client_test.go
+++ b/examples/integration/client_test.go
@@ -135,7 +135,7 @@ func testABEClientCreateBody(t *testing.T, cl *abe.ABitOfEverythingServiceApi) {
 			},
 		},
 		RepeatedStringValue: []string{"a", "b", "c"},
-		OneofString:         "x",
+		OneofValueString:    "x",
 		MapValue:            map[string]abe.ExamplepbNumericEnum{
 			// "a": abe.ExamplepbNumericEnum_ONE,
 			// "b": abe.ExamplepbNumericEnum_ZERO,
diff --git a/examples/integration/integration_test.go b/examples/integration/integration_test.go
index 0c2885c4557..73dec2cb4ff 100644
--- a/examples/integration/integration_test.go
+++ b/examples/integration/integration_test.go
@@ -347,8 +347,8 @@ func testABECreateBody(t *testing.T, port int) {
 			},
 		},
 		RepeatedStringValue: []string{"a", "b", "c"},
-		OneofValue: &gw.ABitOfEverything_OneofString{
-			OneofString: "x",
+		OneofValue: &gw.ABitOfEverything_OneofValueString{
+			OneofValueString: "x",
 		},
 		MapValue: map[string]gw.NumericEnum{
 			"a": gw.NumericEnum_ONE,
@@ -825,6 +825,68 @@ func testAdditionalBindings(t *testing.T, port int) {
 	}
 }
 
+// TestDeepFields tests deeply nested fields in path parameters.
+//
+// NOTE: deeply nested fields are not allowed in body parameters.
+// c.f. third_party/googleapis/google/api/http.proto
+// > the referred field must not be a repeated field and must be
+// > present at the top-level of request message type.
+func TestDeepFields(t *testing.T) {
+	const base = "http://localhost:8080"
+
+	for i, spec := range []struct {
+		path    string
+		payload string
+		want    gw.ABitOfEverything
+	}{
+		{
+			path: "/v1/example/a_bit_of_everything/foo",
+			want: gw.ABitOfEverything{
+				SingleNested: &gw.ABitOfEverything_Nested{
+					Name: "foo",
+				},
+			},
+		},
+		{
+			path: "/v2/example/single_nested/deeper_nested_value/foo",
+			want: gw.ABitOfEverything{
+				SingleNested: &gw.ABitOfEverything_Nested{
+					DeeperNestedValue: &sub.StringMessage{
+						Value: proto.String("foo"),
+					},
+				},
+			},
+		},
+	} {
+		url := base + spec.path
+		resp, err := http.Post(url, "application/json", strings.NewReader(spec.payload))
+		if err != nil {
+			t.Errorf("http.Post(%q) failed with %v; want success; at i=%d", url, err, i)
+			return
+		}
+		defer resp.Body.Close()
+		buf, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			t.Errorf("iotuil.ReadAll(resp.Body) failed with %v; want success; at i=%d", err, i)
+			return
+		}
+
+		if got, want := resp.StatusCode, http.StatusOK; got != want {
+			t.Errorf("resp.StatusCode = %d; want %d; at i=%d", got, want, i)
+			t.Logf("%s", buf)
+		}
+
+		var got gw.ABitOfEverything
+		if err := jsonpb.UnmarshalString(string(buf), &got); err != nil {
+			t.Errorf("jsonpb.UnmarshalString(%s, &msg) failed with %v; want success; at i=%d", buf, err, i)
+			return
+		}
+		if !reflect.DeepEqual(got, spec.want) {
+			t.Errorf("got = %v; want %v; at i=%d", got, spec.want, i)
+		}
+	}
+}
+
 func TestTimeout(t *testing.T) {
 	url := "http://localhost:8080/v2/example/timeout"
 	req, err := http.NewRequest("GET", url, nil)
diff --git a/examples/proto/examplepb/a_bit_of_everything.pb.go b/examples/proto/examplepb/a_bit_of_everything.pb.go
index 23703e51d83..ce3e635b6e3 100644
--- a/examples/proto/examplepb/a_bit_of_everything.pb.go
+++ b/examples/proto/examplepb/a_bit_of_everything.pb.go
@@ -75,7 +75,7 @@ func (ABitOfEverything_Nested_DeepEnum) EnumDescriptor() ([]byte, []int) {
 }
 
 // Intentionaly complicated message type to cover much features of Protobuf.
-// NEXT ID: 30
+// NEXT ID: 31
 type ABitOfEverything struct {
 	SingleNested        *ABitOfEverything_Nested   `protobuf:"bytes,25,opt,name=single_nested,json=singleNested" json:"single_nested,omitempty"`
 	Uuid                string                     `protobuf:"bytes,1,opt,name=uuid" json:"uuid,omitempty"`
@@ -98,8 +98,8 @@ type ABitOfEverything struct {
 	Sint64Value         int64                      `protobuf:"zigzag64,18,opt,name=sint64_value,json=sint64Value" json:"sint64_value,omitempty"`
 	RepeatedStringValue []string                   `protobuf:"bytes,19,rep,name=repeated_string_value,json=repeatedStringValue" json:"repeated_string_value,omitempty"`
 	// Types that are valid to be assigned to OneofValue:
-	//	*ABitOfEverything_OneofEmpty
-	//	*ABitOfEverything_OneofString
+	//	*ABitOfEverything_OneofValueString
+	//	*ABitOfEverything_OneofValueNested
 	OneofValue               isABitOfEverything_OneofValue       `protobuf_oneof:"oneof_value"`
 	MapValue                 map[string]NumericEnum              `protobuf:"bytes,22,rep,name=map_value,json=mapValue" json:"map_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=grpc.gateway.examples.examplepb.NumericEnum"`
 	MappedStringValue        map[string]string                   `protobuf:"bytes,23,rep,name=mapped_string_value,json=mappedStringValue" json:"mapped_string_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
@@ -119,15 +119,15 @@ type isABitOfEverything_OneofValue interface {
 	isABitOfEverything_OneofValue()
 }
 
-type ABitOfEverything_OneofEmpty struct {
-	OneofEmpty *google_protobuf1.Empty `protobuf:"bytes,20,opt,name=oneof_empty,json=oneofEmpty,oneof"`
+type ABitOfEverything_OneofValueString struct {
+	OneofValueString string `protobuf:"bytes,21,opt,name=oneof_value_string,json=oneofValueString,oneof"`
 }
-type ABitOfEverything_OneofString struct {
-	OneofString string `protobuf:"bytes,21,opt,name=oneof_string,json=oneofString,oneof"`
+type ABitOfEverything_OneofValueNested struct {
+	OneofValueNested *ABitOfEverything_Nested `protobuf:"bytes,30,opt,name=oneof_value_nested,json=oneofValueNested,oneof"`
 }
 
-func (*ABitOfEverything_OneofEmpty) isABitOfEverything_OneofValue()  {}
-func (*ABitOfEverything_OneofString) isABitOfEverything_OneofValue() {}
+func (*ABitOfEverything_OneofValueString) isABitOfEverything_OneofValue() {}
+func (*ABitOfEverything_OneofValueNested) isABitOfEverything_OneofValue() {}
 
 func (m *ABitOfEverything) GetOneofValue() isABitOfEverything_OneofValue {
 	if m != nil {
@@ -276,18 +276,18 @@ func (m *ABitOfEverything) GetRepeatedStringValue() []string {
 	return nil
 }
 
-func (m *ABitOfEverything) GetOneofEmpty() *google_protobuf1.Empty {
-	if x, ok := m.GetOneofValue().(*ABitOfEverything_OneofEmpty); ok {
-		return x.OneofEmpty
+func (m *ABitOfEverything) GetOneofValueString() string {
+	if x, ok := m.GetOneofValue().(*ABitOfEverything_OneofValueString); ok {
+		return x.OneofValueString
 	}
-	return nil
+	return ""
 }
 
-func (m *ABitOfEverything) GetOneofString() string {
-	if x, ok := m.GetOneofValue().(*ABitOfEverything_OneofString); ok {
-		return x.OneofString
+func (m *ABitOfEverything) GetOneofValueNested() *ABitOfEverything_Nested {
+	if x, ok := m.GetOneofValue().(*ABitOfEverything_OneofValueNested); ok {
+		return x.OneofValueNested
 	}
-	return ""
+	return nil
 }
 
 func (m *ABitOfEverything) GetMapValue() map[string]NumericEnum {
@@ -335,8 +335,8 @@ func (m *ABitOfEverything) GetRepeatedEnumValue() []NumericEnum {
 // XXX_OneofFuncs is for the internal use of the proto package.
 func (*ABitOfEverything) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
 	return _ABitOfEverything_OneofMarshaler, _ABitOfEverything_OneofUnmarshaler, _ABitOfEverything_OneofSizer, []interface{}{
-		(*ABitOfEverything_OneofEmpty)(nil),
-		(*ABitOfEverything_OneofString)(nil),
+		(*ABitOfEverything_OneofValueString)(nil),
+		(*ABitOfEverything_OneofValueNested)(nil),
 	}
 }
 
@@ -344,14 +344,14 @@ func _ABitOfEverything_OneofMarshaler(msg proto.Message, b *proto.Buffer) error
 	m := msg.(*ABitOfEverything)
 	// oneof_value
 	switch x := m.OneofValue.(type) {
-	case *ABitOfEverything_OneofEmpty:
-		b.EncodeVarint(20<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofEmpty); err != nil {
+	case *ABitOfEverything_OneofValueString:
+		b.EncodeVarint(21<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.OneofValueString)
+	case *ABitOfEverything_OneofValueNested:
+		b.EncodeVarint(30<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.OneofValueNested); err != nil {
 			return err
 		}
-	case *ABitOfEverything_OneofString:
-		b.EncodeVarint(21<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
 	case nil:
 	default:
 		return fmt.Errorf("ABitOfEverything.OneofValue has unexpected type %T", x)
@@ -362,20 +362,20 @@ func _ABitOfEverything_OneofMarshaler(msg proto.Message, b *proto.Buffer) error
 func _ABitOfEverything_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
 	m := msg.(*ABitOfEverything)
 	switch tag {
-	case 20: // oneof_value.oneof_empty
+	case 21: // oneof_value.oneof_value_string
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		msg := new(google_protobuf1.Empty)
-		err := b.DecodeMessage(msg)
-		m.OneofValue = &ABitOfEverything_OneofEmpty{msg}
+		x, err := b.DecodeStringBytes()
+		m.OneofValue = &ABitOfEverything_OneofValueString{x}
 		return true, err
-	case 21: // oneof_value.oneof_string
+	case 30: // oneof_value.oneof_value_nested
 		if wire != proto.WireBytes {
 			return true, proto.ErrInternalBadWireType
 		}
-		x, err := b.DecodeStringBytes()
-		m.OneofValue = &ABitOfEverything_OneofString{x}
+		msg := new(ABitOfEverything_Nested)
+		err := b.DecodeMessage(msg)
+		m.OneofValue = &ABitOfEverything_OneofValueNested{msg}
 		return true, err
 	default:
 		return false, nil
@@ -386,15 +386,15 @@ func _ABitOfEverything_OneofSizer(msg proto.Message) (n int) {
 	m := msg.(*ABitOfEverything)
 	// oneof_value
 	switch x := m.OneofValue.(type) {
-	case *ABitOfEverything_OneofEmpty:
-		s := proto.Size(x.OneofEmpty)
-		n += proto.SizeVarint(20<<3 | proto.WireBytes)
+	case *ABitOfEverything_OneofValueString:
+		n += proto.SizeVarint(21<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(len(x.OneofValueString)))
+		n += len(x.OneofValueString)
+	case *ABitOfEverything_OneofValueNested:
+		s := proto.Size(x.OneofValueNested)
+		n += proto.SizeVarint(30<<3 | proto.WireBytes)
 		n += proto.SizeVarint(uint64(s))
 		n += s
-	case *ABitOfEverything_OneofString:
-		n += proto.SizeVarint(21<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
 	case nil:
 	default:
 		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
@@ -403,11 +403,13 @@ func _ABitOfEverything_OneofSizer(msg proto.Message) (n int) {
 }
 
 // Nested is nested type.
+// NEXT ID: 5
 type ABitOfEverything_Nested struct {
 	// name is nested field.
-	Name   string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Amount uint32                           `protobuf:"varint,2,opt,name=amount" json:"amount,omitempty"`
-	Ok     ABitOfEverything_Nested_DeepEnum `protobuf:"varint,3,opt,name=ok,enum=grpc.gateway.examples.examplepb.ABitOfEverything_Nested_DeepEnum" json:"ok,omitempty"`
+	Name              string                                   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Amount            uint32                                   `protobuf:"varint,2,opt,name=amount" json:"amount,omitempty"`
+	Ok                ABitOfEverything_Nested_DeepEnum         `protobuf:"varint,3,opt,name=ok,enum=grpc.gateway.examples.examplepb.ABitOfEverything_Nested_DeepEnum" json:"ok,omitempty"`
+	DeeperNestedValue *grpc_gateway_examples_sub.StringMessage `protobuf:"bytes,4,opt,name=deeper_nested_value,json=deeperNestedValue" json:"deeper_nested_value,omitempty"`
 }
 
 func (m *ABitOfEverything_Nested) Reset()                    { *m = ABitOfEverything_Nested{} }
@@ -436,6 +438,13 @@ func (m *ABitOfEverything_Nested) GetOk() ABitOfEverything_Nested_DeepEnum {
 	return ABitOfEverything_Nested_FALSE
 }
 
+func (m *ABitOfEverything_Nested) GetDeeperNestedValue() *grpc_gateway_examples_sub.StringMessage {
+	if m != nil {
+		return m.DeeperNestedValue
+	}
+	return nil
+}
+
 type Body struct {
 	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 }
@@ -1098,132 +1107,135 @@ var _AnotherServiceWithNoBindings_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("examples/proto/examplepb/a_bit_of_everything.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 2019 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0xdb, 0xc8,
-	0x15, 0xf7, 0x48, 0xb2, 0x22, 0x3d, 0xf9, 0x43, 0x1e, 0xe7, 0xc3, 0x51, 0x9c, 0xf5, 0x44, 0xc9,
-	0xb6, 0x8c, 0x37, 0x22, 0x37, 0xca, 0xa2, 0xd8, 0x08, 0x68, 0xb7, 0xb2, 0xad, 0x4d, 0x82, 0x6c,
-	0x9c, 0x84, 0xd9, 0x4d, 0x83, 0x34, 0x5b, 0x83, 0x22, 0x47, 0x12, 0x13, 0x91, 0xc3, 0x92, 0x43,
-	0x27, 0xaa, 0xeb, 0x16, 0xed, 0x02, 0x2d, 0xf6, 0x54, 0xc0, 0xbd, 0xef, 0xa5, 0x40, 0xd1, 0x4b,
-	0x0f, 0x3d, 0xf4, 0x54, 0xa0, 0x3d, 0xf6, 0xd0, 0x63, 0x81, 0xde, 0x0b, 0xf4, 0xd4, 0x63, 0xff,
-	0x82, 0x62, 0x86, 0xa4, 0x42, 0xc9, 0x16, 0x1c, 0x39, 0x8b, 0xbd, 0x24, 0x9c, 0x99, 0xdf, 0x7b,
-	0xef, 0xf7, 0xde, 0xbc, 0xf7, 0xe6, 0xc9, 0x50, 0xa7, 0xaf, 0x0c, 0xc7, 0xeb, 0xd3, 0x40, 0xf3,
-	0x7c, 0xc6, 0x99, 0x16, 0x2f, 0xbd, 0xb6, 0x66, 0xec, 0xb4, 0x6d, 0xbe, 0xc3, 0x3a, 0x3b, 0x74,
-	0x97, 0xfa, 0x03, 0xde, 0xb3, 0xdd, 0xae, 0x2a, 0x31, 0x78, 0xad, 0xeb, 0x7b, 0xa6, 0xda, 0x35,
-	0x38, 0x7d, 0x69, 0x0c, 0xd4, 0x44, 0x81, 0x3a, 0x14, 0xad, 0xac, 0x76, 0x19, 0xeb, 0xf6, 0xa9,
-	0x66, 0x78, 0xb6, 0x66, 0xb8, 0x2e, 0xe3, 0x06, 0xb7, 0x99, 0x1b, 0x44, 0xe2, 0x95, 0x0b, 0xf1,
-	0xa9, 0x5c, 0xb5, 0xc3, 0x8e, 0x46, 0x1d, 0x8f, 0x0f, 0xe2, 0xc3, 0x77, 0xc6, 0x0f, 0xad, 0xd0,
-	0x97, 0xd2, 0xf1, 0x39, 0x19, 0xe3, 0x1b, 0x84, 0x6d, 0xcd, 0xa1, 0x41, 0x60, 0x74, 0x69, 0x8c,
-	0xb8, 0x74, 0x18, 0x51, 0x1f, 0x83, 0xac, 0x8d, 0x1b, 0xe1, 0xb6, 0x43, 0x03, 0x6e, 0x38, 0x5e,
-	0x0c, 0xb8, 0x26, 0xff, 0x33, 0x6b, 0x5d, 0xea, 0xd6, 0x82, 0x97, 0x46, 0xb7, 0x4b, 0x7d, 0x8d,
-	0x79, 0xd2, 0x89, 0xc3, 0x0e, 0x55, 0xff, 0x5a, 0x86, 0x72, 0x73, 0xc3, 0xe6, 0xf7, 0x3b, 0xad,
-	0x61, 0xa8, 0xf0, 0xe7, 0x30, 0x1f, 0xd8, 0x6e, 0xb7, 0x4f, 0x77, 0x5c, 0x1a, 0x70, 0x6a, 0xad,
-	0x9c, 0x27, 0x48, 0x29, 0xd5, 0x3f, 0x54, 0x8f, 0x09, 0x9e, 0x3a, 0xae, 0x49, 0xdd, 0x96, 0xf2,
-	0xfa, 0x5c, 0xa4, 0x2e, 0x5a, 0x61, 0x0c, 0xb9, 0x30, 0xb4, 0xad, 0x15, 0x44, 0x90, 0x52, 0xd4,
-	0xe5, 0x37, 0x7e, 0x00, 0xf9, 0xd8, 0x56, 0x86, 0x64, 0xdf, 0xca, 0x56, 0xac, 0x07, 0xaf, 0x41,
-	0xa9, 0xd3, 0x67, 0x06, 0xdf, 0xd9, 0x35, 0xfa, 0x21, 0x5d, 0xc9, 0x12, 0xa4, 0x64, 0x74, 0x90,
-	0x5b, 0x8f, 0xc5, 0x0e, 0xbe, 0x04, 0x73, 0x16, 0x0b, 0xdb, 0x7d, 0x1a, 0x23, 0x72, 0x04, 0x29,
-	0x48, 0x2f, 0x45, 0x7b, 0x11, 0x64, 0x0d, 0x4a, 0xb6, 0xcb, 0xbf, 0xf3, 0x41, 0x8c, 0x98, 0x25,
-	0x48, 0xc9, 0xea, 0x20, 0xb7, 0x86, 0x3a, 0xc2, 0x34, 0x22, 0x4f, 0x90, 0x92, 0xd3, 0x4b, 0x61,
-	0x0a, 0x12, 0xe9, 0xb8, 0x51, 0x8f, 0x11, 0xa7, 0x08, 0x52, 0x66, 0xa5, 0x8e, 0x1b, 0xf5, 0x08,
-	0x70, 0x19, 0xe6, 0x3b, 0xf6, 0x2b, 0x6a, 0x0d, 0x95, 0x14, 0x08, 0x52, 0xf2, 0xfa, 0x5c, 0xbc,
-	0x39, 0x0a, 0x1a, 0xea, 0x29, 0x12, 0xa4, 0x9c, 0x8a, 0x41, 0x89, 0xa6, 0x8b, 0x00, 0x6d, 0xc6,
-	0xfa, 0x31, 0x02, 0x08, 0x52, 0x0a, 0x7a, 0x51, 0xec, 0x0c, 0xc9, 0x06, 0xdc, 0xb7, 0xdd, 0x6e,
-	0x0c, 0x28, 0xc9, 0xf8, 0x97, 0xa2, 0xbd, 0x21, 0xd9, 0xf6, 0x80, 0xd3, 0x20, 0x46, 0x5c, 0x24,
-	0x48, 0x99, 0xd3, 0x41, 0x6e, 0x8d, 0x38, 0x3c, 0xa4, 0x31, 0x4f, 0x90, 0x32, 0x1f, 0x39, 0x9c,
-	0xb0, 0xb8, 0x0b, 0x40, 0xdd, 0xd0, 0x89, 0x01, 0x0b, 0x04, 0x29, 0x0b, 0xf5, 0x6b, 0xc7, 0x5e,
-	0xe7, 0x76, 0xe8, 0x50, 0xdf, 0x36, 0x5b, 0x6e, 0xe8, 0xe8, 0x45, 0x21, 0x1f, 0x29, 0x7b, 0x17,
-	0x16, 0x82, 0x51, 0xc7, 0x17, 0x09, 0x52, 0x16, 0xf5, 0xf9, 0x60, 0xc4, 0xf3, 0x21, 0x6c, 0x18,
-	0xc4, 0x32, 0x41, 0x4a, 0x39, 0x81, 0xa5, 0xae, 0x2b, 0x48, 0xb3, 0x5f, 0x22, 0x48, 0x59, 0xd2,
-	0x4b, 0x41, 0x8a, 0x7d, 0x0c, 0x19, 0xea, 0xc1, 0x04, 0x29, 0x38, 0x82, 0x24, 0x5a, 0xea, 0x70,
-	0xc6, 0xa7, 0x1e, 0x35, 0x38, 0xb5, 0x76, 0x46, 0x02, 0xba, 0x4c, 0xb2, 0x4a, 0x51, 0x5f, 0x4e,
-	0x0e, 0x1f, 0xa5, 0x02, 0x7b, 0x13, 0x4a, 0xcc, 0xa5, 0xa2, 0x23, 0x89, 0x86, 0xb1, 0x72, 0x5a,
-	0x16, 0xd4, 0x59, 0x35, 0x2a, 0x66, 0x35, 0x29, 0x66, 0xb5, 0x25, 0x4e, 0x6f, 0xcf, 0xe8, 0x20,
-	0xc1, 0x72, 0x85, 0x2f, 0xc3, 0x5c, 0x24, 0x1a, 0xd9, 0x5a, 0x39, 0x23, 0xae, 0xed, 0xf6, 0x8c,
-	0x1e, 0x29, 0x8c, 0x8c, 0xe0, 0x67, 0x50, 0x74, 0x0c, 0x2f, 0xe6, 0x71, 0x56, 0x96, 0xd0, 0x47,
-	0xd3, 0x97, 0xd0, 0x3d, 0xc3, 0x93, 0x74, 0x5b, 0x2e, 0xf7, 0x07, 0x7a, 0xc1, 0x89, 0x97, 0xf8,
-	0x15, 0x2c, 0x3b, 0x86, 0xe7, 0x8d, 0xfb, 0x7b, 0x4e, 0xda, 0xb9, 0x7d, 0x22, 0x3b, 0xde, 0x48,
-	0x7c, 0x22, 0x83, 0x4b, 0xce, 0xf8, 0x7e, 0xca, 0x72, 0x54, 0xd6, 0xb1, 0xe5, 0x95, 0xb7, 0xb3,
-	0x1c, 0xb5, 0x8a, 0xc3, 0x96, 0x53, 0xfb, 0xb8, 0x01, 0x2b, 0x2e, 0x73, 0x37, 0x99, 0xbb, 0x4b,
-	0x5d, 0xd1, 0x31, 0x8d, 0xfe, 0xb6, 0xe1, 0x44, 0x7d, 0x61, 0xa5, 0x22, 0x2b, 0x67, 0xe2, 0x39,
-	0xde, 0x84, 0xc5, 0x61, 0x5b, 0x8e, 0x19, 0x5f, 0x90, 0x37, 0x5e, 0x39, 0x74, 0xe3, 0x9f, 0x26,
-	0x38, 0x7d, 0x61, 0x28, 0x12, 0x29, 0x79, 0x06, 0xc3, 0x4c, 0xda, 0x49, 0x15, 0xd4, 0x2a, 0xc9,
-	0x4e, 0x5d, 0x50, 0x4b, 0x89, 0xa2, 0x56, 0x52, 0x58, 0x95, 0x3f, 0x20, 0xc8, 0xbf, 0xee, 0xc7,
-	0xae, 0xe1, 0xd0, 0xa4, 0x1f, 0x8b, 0x6f, 0x7c, 0x16, 0xf2, 0x86, 0xc3, 0x42, 0x97, 0xaf, 0x64,
-	0x64, 0x85, 0xc7, 0x2b, 0xfc, 0x10, 0x32, 0xec, 0x85, 0x6c, 0xa6, 0x0b, 0xf5, 0xe6, 0x49, 0x7b,
-	0xb4, 0xba, 0x45, 0xa9, 0x27, 0x89, 0x65, 0xd8, 0x8b, 0xea, 0x1a, 0x14, 0x92, 0x35, 0x2e, 0xc2,
-	0xec, 0xc7, 0xcd, 0x4f, 0x1e, 0xb5, 0xca, 0x33, 0xb8, 0x00, 0xb9, 0x4f, 0xf5, 0xcf, 0x5a, 0x65,
-	0x54, 0xb1, 0x61, 0x7e, 0x24, 0x31, 0x71, 0x19, 0xb2, 0x2f, 0xe8, 0x20, 0xe6, 0x2b, 0x3e, 0xf1,
-	0x06, 0xcc, 0x46, 0xd1, 0xc9, 0x9c, 0xa0, 0xdd, 0x44, 0xa2, 0x8d, 0xcc, 0x87, 0xa8, 0xb2, 0x05,
-	0x67, 0x8f, 0xce, 0xcd, 0x23, 0x6c, 0x9e, 0x4e, 0xdb, 0x2c, 0xa6, 0xb5, 0xfc, 0x2c, 0xd1, 0x32,
-	0x9e, 0x67, 0x47, 0x68, 0xd9, 0x4e, 0x6b, 0x79, 0x9b, 0x77, 0xef, 0xb5, 0xfd, 0xc6, 0x0f, 0x0f,
-	0x9a, 0x4f, 0xd6, 0x1f, 0xc3, 0x95, 0x8f, 0x6d, 0xd7, 0x22, 0x2c, 0xe4, 0xc4, 0x61, 0x3e, 0x25,
-	0x46, 0x5b, 0x7c, 0x1e, 0x7a, 0xec, 0xd5, 0x1e, 0xe7, 0x5e, 0xd0, 0xd0, 0xb4, 0xae, 0xcd, 0x7b,
-	0x61, 0x5b, 0x35, 0x99, 0xa3, 0x09, 0x0e, 0x35, 0x6a, 0xb2, 0x60, 0x10, 0x70, 0x1a, 0x2f, 0x63,
-	0x4a, 0x1b, 0xf3, 0x49, 0x27, 0x93, 0xf6, 0xaa, 0x15, 0xc8, 0x6d, 0x30, 0x6b, 0x70, 0x54, 0x12,
-	0x55, 0x9f, 0xc1, 0xe2, 0xbd, 0x68, 0x78, 0xf9, 0x81, 0xcd, 0x7b, 0x12, 0xb6, 0x00, 0x99, 0xe1,
-	0xcb, 0x9f, 0xb1, 0x2d, 0x7c, 0x13, 0x72, 0x96, 0xc1, 0x8d, 0xd8, 0xfb, 0x77, 0x8f, 0xf5, 0x5e,
-	0x28, 0xd1, 0xa5, 0xc8, 0x3a, 0x81, 0x52, 0xea, 0x16, 0x45, 0xbe, 0x3c, 0x6d, 0xe9, 0xf7, 0xcb,
-	0x33, 0xf8, 0x14, 0x64, 0xef, 0x6f, 0xb7, 0xca, 0xa8, 0xfe, 0xa7, 0x65, 0x38, 0x37, 0xee, 0xef,
-	0x23, 0xea, 0xef, 0xda, 0x26, 0xc5, 0x5f, 0x65, 0x21, 0xbf, 0xe9, 0x8b, 0xa2, 0xc0, 0xd7, 0xa7,
-	0x8e, 0x79, 0x65, 0x7a, 0x91, 0xea, 0x1f, 0x33, 0xbf, 0xfc, 0xe7, 0x7f, 0x7e, 0x9b, 0xf9, 0x7d,
-	0xa6, 0xfa, 0xbb, 0x8c, 0xb6, 0x7b, 0x3d, 0x99, 0x56, 0x8f, 0x9a, 0x55, 0xb5, 0xbd, 0xd4, 0xe4,
-	0xb2, 0xaf, 0xed, 0xa5, 0xc7, 0x94, 0x7d, 0x6d, 0x2f, 0xf5, 0x3c, 0xed, 0x6b, 0x01, 0xf5, 0x0c,
-	0xdf, 0xe0, 0xcc, 0xd7, 0xf6, 0xc2, 0x91, 0x83, 0xbd, 0xd4, 0x43, 0xb7, 0xaf, 0xed, 0x8d, 0xbc,
-	0x8e, 0xc9, 0x3a, 0x75, 0xfe, 0x7a, 0x70, 0xd8, 0xd7, 0xf6, 0xd2, 0x5d, 0xfe, 0xbb, 0x01, 0xf7,
-	0x3d, 0x9f, 0x76, 0xec, 0x57, 0xda, 0xfa, 0x7e, 0x64, 0x24, 0x25, 0x16, 0x8c, 0xeb, 0x09, 0xc6,
-	0x0d, 0x05, 0x63, 0x02, 0xa3, 0x24, 0x27, 0xb5, 0xd0, 0x7d, 0xfc, 0x15, 0x02, 0x88, 0x2e, 0x48,
-	0x26, 0xce, 0x37, 0x73, 0x49, 0xeb, 0xf2, 0x8e, 0xae, 0x54, 0xd7, 0x8e, 0xb9, 0xa1, 0x06, 0x5a,
-	0xc7, 0x3f, 0x85, 0xfc, 0x27, 0x8c, 0xbd, 0x08, 0x3d, 0xbc, 0xa8, 0x8a, 0x41, 0x5d, 0xbd, 0x63,
-	0xc5, 0xd9, 0x7e, 0x12, 0xcb, 0xaa, 0xb4, 0xac, 0xe0, 0x6f, 0x1d, 0x9b, 0x1b, 0x62, 0x5e, 0xde,
-	0xc7, 0xbf, 0x42, 0x90, 0xff, 0xcc, 0xb3, 0x4e, 0x98, 0xbf, 0x13, 0x26, 0x8f, 0xea, 0x75, 0xc9,
-	0xe2, 0xbd, 0xca, 0x1b, 0xb2, 0x10, 0x61, 0xf8, 0x0d, 0x82, 0xfc, 0x16, 0xed, 0x53, 0x4e, 0x0f,
-	0xc7, 0x61, 0x92, 0x99, 0x67, 0x07, 0xcd, 0xf7, 0xda, 0x57, 0x61, 0x01, 0xa0, 0xe9, 0xd9, 0x77,
-	0xe9, 0xa0, 0x19, 0xf2, 0x1e, 0x9e, 0x81, 0x73, 0x90, 0xbf, 0x2f, 0x3e, 0xeb, 0x78, 0x1e, 0x72,
-	0x3e, 0x35, 0x2c, 0x98, 0x7d, 0xe9, 0xdb, 0x9c, 0x46, 0xa1, 0x59, 0x7f, 0xd3, 0xd0, 0xfc, 0x1b,
-	0x41, 0xe1, 0x16, 0xe5, 0x0f, 0x43, 0xea, 0x0f, 0xbe, 0xce, 0xe0, 0x7c, 0x89, 0x0e, 0x9a, 0x7a,
-	0x75, 0x1b, 0x56, 0x8f, 0xea, 0xab, 0x43, 0x83, 0x53, 0xf6, 0xd3, 0x27, 0x48, 0x7a, 0xa7, 0xe2,
-	0x6b, 0xc7, 0x79, 0xf7, 0x63, 0xa1, 0x3e, 0xf1, 0xf1, 0xef, 0x19, 0xc8, 0xb5, 0xcc, 0x1e, 0xc3,
-	0xca, 0x04, 0xff, 0x82, 0xb0, 0xad, 0x46, 0x8f, 0x58, 0x72, 0x19, 0x6f, 0x8c, 0xac, 0xfe, 0x17,
-	0x1d, 0x34, 0xbf, 0x40, 0x30, 0x47, 0xcd, 0x1e, 0x23, 0x41, 0xd4, 0x30, 0xa1, 0x20, 0x57, 0xbe,
-	0x67, 0xe2, 0xa5, 0x47, 0xa1, 0xe3, 0x18, 0xfe, 0xa0, 0x41, 0x5a, 0xf1, 0x56, 0xa5, 0xbc, 0x45,
-	0x03, 0xd3, 0xb7, 0xe5, 0xcf, 0x4c, 0xb9, 0x5b, 0xdd, 0x02, 0x3c, 0x1a, 0x26, 0xc9, 0x76, 0xca,
-	0xe0, 0xc8, 0xd0, 0x7c, 0x7e, 0x7c, 0x68, 0x04, 0x35, 0x6d, 0x2f, 0xea, 0x29, 0x4f, 0xcf, 0x57,
-	0xcb, 0xda, 0x6e, 0x7d, 0x88, 0x17, 0x67, 0x8d, 0xe8, 0x71, 0x7c, 0x8a, 0xf1, 0xa1, 0x23, 0xfc,
-	0x67, 0x04, 0x73, 0x62, 0xfe, 0x78, 0x60, 0xf0, 0x9e, 0xe4, 0xf8, 0xcd, 0x74, 0x9a, 0x8f, 0xa4,
-	0x6f, 0x37, 0xab, 0x1f, 0x1c, 0x9b, 0xd4, 0x23, 0x3f, 0xc5, 0x55, 0xf1, 0xb0, 0xca, 0xba, 0x6b,
-	0x02, 0x6c, 0xb3, 0x0d, 0xdb, 0xb5, 0x6c, 0xb7, 0x1b, 0xe0, 0xf3, 0x87, 0x72, 0x76, 0x2b, 0xfe,
-	0xe3, 0xc3, 0xc4, 0x74, 0x9e, 0xc1, 0x8f, 0xe1, 0x94, 0x18, 0x3f, 0x59, 0xc8, 0xf1, 0x04, 0xd0,
-	0x44, 0xe1, 0x0b, 0x92, 0xfe, 0x19, 0xbc, 0x9c, 0x8e, 0x27, 0x8f, 0x95, 0xf5, 0xa0, 0xdc, 0xf2,
-	0x7d, 0xe6, 0x8b, 0x57, 0x7f, 0x8b, 0x72, 0xc3, 0xee, 0x07, 0x53, 0x1b, 0xb8, 0x22, 0x0d, 0xbc,
-	0x83, 0x57, 0x47, 0x2e, 0x4c, 0x68, 0x7d, 0x69, 0xf3, 0x9e, 0x15, 0x6b, 0xfd, 0x35, 0x02, 0x7c,
-	0x8b, 0xf2, 0xf1, 0x29, 0xe3, 0xfd, 0x63, 0xef, 0x63, 0x4c, 0x62, 0x22, 0x8d, 0x6f, 0x4b, 0x1a,
-	0x97, 0xaa, 0xe7, 0xd3, 0x34, 0x04, 0x83, 0x36, 0xb3, 0x06, 0xda, 0x9e, 0xe8, 0x81, 0x72, 0x1a,
-	0xc1, 0x5f, 0x20, 0x58, 0x7a, 0xc0, 0x02, 0x2e, 0x34, 0x4a, 0x51, 0x49, 0xe4, 0xcd, 0x06, 0x9a,
-	0x89, 0xd6, 0x35, 0x69, 0xfd, 0x6a, 0xf5, 0x4a, 0xda, 0xba, 0xc7, 0x02, 0x2e, 0x18, 0xc8, 0x5f,
-	0x92, 0x11, 0x8d, 0x24, 0x29, 0x2a, 0x7f, 0x43, 0x07, 0xcd, 0xbf, 0x20, 0xdc, 0x99, 0x30, 0xf5,
-	0x10, 0x2b, 0x55, 0xa6, 0xb5, 0x1a, 0x79, 0xd9, 0xb3, 0xcd, 0x1e, 0x09, 0x7a, 0x2c, 0xec, 0x5b,
-	0xc4, 0x65, 0x9c, 0xb4, 0x29, 0x09, 0x03, 0x6a, 0x11, 0xdb, 0x25, 0x5e, 0xdf, 0x30, 0x29, 0x61,
-	0x1d, 0xc2, 0x7b, 0x94, 0x58, 0xcc, 0x0c, 0x1d, 0xea, 0x46, 0x7f, 0x3b, 0x22, 0x26, 0x73, 0xc4,
-	0xe2, 0x52, 0xe5, 0x21, 0xac, 0x1d, 0xd5, 0x0b, 0x45, 0x19, 0x25, 0x73, 0xd6, 0x94, 0x15, 0x5f,
-	0x7f, 0x0e, 0xa7, 0x4d, 0xc3, 0xa1, 0xfd, 0x4d, 0x23, 0xa0, 0xb1, 0x0e, 0x31, 0x14, 0x60, 0x1d,
-	0x66, 0xa3, 0x9f, 0xc3, 0xd3, 0x26, 0xd2, 0x79, 0x19, 0xc3, 0x65, 0xbc, 0x34, 0x92, 0x48, 0xe2,
-	0xa8, 0xfe, 0x23, 0x58, 0x6d, 0xba, 0x8c, 0xf7, 0xa8, 0x1f, 0x5b, 0x12, 0x97, 0x97, 0x2a, 0xaa,
-	0xef, 0x8d, 0x94, 0xd8, 0xb4, 0x86, 0x67, 0x36, 0x7e, 0x31, 0x7b, 0xd0, 0xfc, 0x5f, 0x0e, 0x73,
-	0x58, 0x6e, 0x92, 0x0d, 0x9b, 0x8b, 0x60, 0xa6, 0x3a, 0xc0, 0x13, 0x38, 0xdd, 0xd5, 0x1f, 0x6c,
-	0xd6, 0x6e, 0x45, 0x9e, 0x13, 0xcf, 0x67, 0xcf, 0xa9, 0xc9, 0xa7, 0x8d, 0x58, 0xa5, 0xec, 0x32,
-	0x97, 0x7e, 0x3f, 0xf6, 0x4c, 0xa0, 0xeb, 0xd9, 0xeb, 0xea, 0xfb, 0xeb, 0x59, 0x94, 0xc9, 0xd5,
-	0xcb, 0x86, 0xe7, 0xf5, 0x6d, 0x53, 0x5e, 0x9b, 0xf6, 0x3c, 0x60, 0x6e, 0xfd, 0x6c, 0x7a, 0xe7,
-	0x55, 0xad, 0xc3, 0x58, 0xcd, 0xb1, 0x1d, 0xda, 0x38, 0x84, 0x6c, 0x4c, 0x40, 0x3e, 0xfd, 0x32,
-	0x03, 0x8b, 0x50, 0xdc, 0x30, 0x02, 0xdb, 0x94, 0xef, 0x76, 0xa6, 0x80, 0xe0, 0xe2, 0xc8, 0x4b,
-	0xbe, 0x58, 0xc8, 0x54, 0x8a, 0x4f, 0x6a, 0xcd, 0x07, 0x77, 0x6a, 0x77, 0xe9, 0x80, 0x64, 0xe0,
-	0x5f, 0x68, 0xf8, 0xb2, 0xff, 0x03, 0x15, 0xb2, 0x4a, 0xae, 0x7e, 0x39, 0x71, 0x32, 0xc5, 0x5b,
-	0x63, 0x46, 0xc8, 0x7b, 0x9a, 0xf8, 0x87, 0xf9, 0xf6, 0x4f, 0x68, 0x63, 0x6d, 0x32, 0x88, 0xb3,
-	0x17, 0xd4, 0xdd, 0xf8, 0x39, 0x54, 0xa2, 0x41, 0x01, 0xe3, 0x5b, 0xbe, 0xe1, 0xf2, 0x80, 0x88,
-	0x05, 0x31, 0x4c, 0x93, 0x06, 0x01, 0xac, 0xc6, 0xe3, 0x03, 0x5e, 0x8e, 0x0f, 0xe5, 0x2a, 0x39,
-	0xdd, 0x84, 0x59, 0xc3, 0x72, 0x6c, 0x17, 0x37, 0x46, 0x44, 0x5d, 0x6b, 0x04, 0x46, 0x38, 0x23,
-	0x12, 0x66, 0x07, 0x5c, 0xf4, 0xd3, 0x5d, 0x4a, 0x6c, 0xb7, 0xc3, 0x7c, 0x47, 0x86, 0xa5, 0xbd,
-	0x06, 0xf3, 0xe9, 0x50, 0xcc, 0x8c, 0x8f, 0x34, 0xed, 0xab, 0x13, 0x87, 0x9a, 0x71, 0xa8, 0x7f,
-	0x07, 0xce, 0xdd, 0x7b, 0x5d, 0x43, 0xe9, 0xd4, 0x98, 0x36, 0x25, 0x9e, 0x16, 0x87, 0xfd, 0xa5,
-	0x9d, 0x97, 0x59, 0x79, 0xe3, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x60, 0xd8, 0x68, 0xe8, 0x2d,
-	0x17, 0x00, 0x00,
+	// 2067 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x1b, 0xc7,
+	0x15, 0xd7, 0x2e, 0x29, 0x5a, 0x7c, 0xfa, 0xa2, 0x46, 0x8e, 0x2d, 0xd3, 0xb2, 0x35, 0x66, 0x9c,
+	0x76, 0xad, 0x58, 0xbb, 0x31, 0x1d, 0x14, 0x09, 0x8b, 0x7e, 0x50, 0x12, 0xe3, 0x18, 0x8e, 0x65,
+	0x7b, 0x9d, 0x38, 0x86, 0xea, 0x54, 0x58, 0x72, 0x87, 0xe4, 0xda, 0xdc, 0x9d, 0xed, 0xee, 0xac,
+	0x6c, 0x56, 0x55, 0x8b, 0x26, 0x40, 0x8b, 0x9c, 0x0a, 0xa8, 0xf7, 0x5c, 0x0a, 0xf4, 0xd6, 0x3f,
+	0xa0, 0x28, 0x8a, 0xdc, 0xda, 0x43, 0x6f, 0x2d, 0xd0, 0x7b, 0x81, 0x9e, 0x7a, 0xec, 0x5f, 0x50,
+	0xcc, 0xec, 0x2c, 0xbd, 0x4b, 0x89, 0xa0, 0x29, 0x17, 0xb9, 0xd8, 0x3b, 0x33, 0xbf, 0xf7, 0xf5,
+	0x9b, 0xf7, 0xde, 0x3c, 0x11, 0xaa, 0xe4, 0x85, 0xe5, 0xfa, 0x3d, 0x12, 0x1a, 0x7e, 0x40, 0x19,
+	0x35, 0xe4, 0xd2, 0x6f, 0x1a, 0xd6, 0x5e, 0xd3, 0x61, 0x7b, 0xb4, 0xbd, 0x47, 0xf6, 0x49, 0xd0,
+	0x67, 0x5d, 0xc7, 0xeb, 0xe8, 0x02, 0x83, 0xd6, 0x3a, 0x81, 0xdf, 0xd2, 0x3b, 0x16, 0x23, 0xcf,
+	0xad, 0xbe, 0x9e, 0x28, 0xd0, 0x07, 0xa2, 0xe5, 0xd5, 0x0e, 0xa5, 0x9d, 0x1e, 0x31, 0x2c, 0xdf,
+	0x31, 0x2c, 0xcf, 0xa3, 0xcc, 0x62, 0x0e, 0xf5, 0xc2, 0x58, 0xbc, 0x7c, 0x51, 0x9e, 0x8a, 0x55,
+	0x33, 0x6a, 0x1b, 0xc4, 0xf5, 0x59, 0x5f, 0x1e, 0x5e, 0x1e, 0x3e, 0xb4, 0xa3, 0x40, 0x48, 0xcb,
+	0x73, 0x3c, 0xe4, 0x6f, 0x18, 0x35, 0x0d, 0x97, 0x84, 0xa1, 0xd5, 0x21, 0x12, 0x71, 0xe5, 0x38,
+	0xa2, 0x3a, 0x04, 0x59, 0x1b, 0x36, 0xc2, 0x1c, 0x97, 0x84, 0xcc, 0x72, 0x7d, 0x09, 0xb8, 0x2e,
+	0xfe, 0x6b, 0x6d, 0x74, 0x88, 0xb7, 0x11, 0x3e, 0xb7, 0x3a, 0x1d, 0x12, 0x18, 0xd4, 0x17, 0x41,
+	0x1c, 0x0f, 0xa8, 0xf2, 0xf7, 0x25, 0x28, 0xd5, 0x37, 0x1d, 0x76, 0xaf, 0xdd, 0x18, 0x50, 0x85,
+	0x3e, 0x83, 0xf9, 0xd0, 0xf1, 0x3a, 0x3d, 0xb2, 0xe7, 0x91, 0x90, 0x11, 0x7b, 0xe5, 0x02, 0x56,
+	0xb4, 0xd9, 0xea, 0x7b, 0xfa, 0x18, 0xf2, 0xf4, 0x61, 0x4d, 0xfa, 0x8e, 0x90, 0x37, 0xe7, 0x62,
+	0x75, 0xf1, 0x0a, 0x21, 0xc8, 0x47, 0x91, 0x63, 0xaf, 0x28, 0x58, 0xd1, 0x8a, 0xa6, 0xf8, 0x46,
+	0xf7, 0xa1, 0x20, 0x6d, 0xa9, 0x38, 0xf7, 0x5a, 0xb6, 0xa4, 0x1e, 0xb4, 0x06, 0xb3, 0xed, 0x1e,
+	0xb5, 0xd8, 0xde, 0xbe, 0xd5, 0x8b, 0xc8, 0x4a, 0x0e, 0x2b, 0x9a, 0x6a, 0x82, 0xd8, 0x7a, 0xc4,
+	0x77, 0xd0, 0x15, 0x98, 0xb3, 0x69, 0xd4, 0xec, 0x11, 0x89, 0xc8, 0x63, 0x45, 0x53, 0xcc, 0xd9,
+	0x78, 0x2f, 0x86, 0xac, 0xc1, 0xac, 0xe3, 0xb1, 0xef, 0xbc, 0x2b, 0x11, 0xd3, 0x58, 0xd1, 0x72,
+	0x26, 0x88, 0xad, 0x81, 0x8e, 0x28, 0x8d, 0x28, 0x60, 0x45, 0xcb, 0x9b, 0xb3, 0x51, 0x0a, 0x12,
+	0xeb, 0xb8, 0x59, 0x95, 0x88, 0x33, 0x58, 0xd1, 0xa6, 0x85, 0x8e, 0x9b, 0xd5, 0x18, 0xf0, 0x26,
+	0xcc, 0xb7, 0x9d, 0x17, 0xc4, 0x1e, 0x28, 0x99, 0xc1, 0x8a, 0x56, 0x30, 0xe7, 0xe4, 0x66, 0x16,
+	0x34, 0xd0, 0x53, 0xc4, 0x8a, 0x76, 0x46, 0x82, 0x12, 0x4d, 0x97, 0x00, 0x9a, 0x94, 0xf6, 0x24,
+	0x02, 0xb0, 0xa2, 0xcd, 0x98, 0x45, 0xbe, 0x33, 0x70, 0x36, 0x64, 0x81, 0xe3, 0x75, 0x24, 0x60,
+	0x56, 0xf0, 0x3f, 0x1b, 0xef, 0x0d, 0x9c, 0x6d, 0xf6, 0x19, 0x09, 0x25, 0xe2, 0x12, 0x56, 0xb4,
+	0x39, 0x13, 0xc4, 0x56, 0x26, 0xe0, 0x81, 0x1b, 0xf3, 0x58, 0xd1, 0xe6, 0xe3, 0x80, 0x13, 0x2f,
+	0xee, 0x00, 0x10, 0x2f, 0x72, 0x25, 0x60, 0x01, 0x2b, 0xda, 0x42, 0xf5, 0xfa, 0xd8, 0xeb, 0xdc,
+	0x89, 0x5c, 0x12, 0x38, 0xad, 0x86, 0x17, 0xb9, 0x66, 0x91, 0xcb, 0xc7, 0xca, 0xde, 0x82, 0x85,
+	0x30, 0x1b, 0xf8, 0x22, 0x56, 0xb4, 0x45, 0x73, 0x3e, 0xcc, 0x44, 0x3e, 0x80, 0x0d, 0x48, 0x2c,
+	0x61, 0x45, 0x2b, 0x25, 0xb0, 0xd4, 0x75, 0x85, 0x69, 0xef, 0x97, 0xb0, 0xa2, 0x2d, 0x99, 0xb3,
+	0x61, 0xca, 0x7b, 0x09, 0x19, 0xe8, 0x41, 0x58, 0xd1, 0x50, 0x0c, 0x49, 0xb4, 0x54, 0xe1, 0x8d,
+	0x80, 0xf8, 0xc4, 0x62, 0xc4, 0xde, 0xcb, 0x10, 0xba, 0x8c, 0x73, 0x5a, 0xd1, 0x5c, 0x4e, 0x0e,
+	0x1f, 0xa6, 0x88, 0xd5, 0x01, 0x51, 0x8f, 0xd0, 0x76, 0x8c, 0x94, 0x62, 0x2b, 0x6f, 0xf0, 0x1b,
+	0xf8, 0x70, 0xca, 0x2c, 0x89, 0x33, 0x81, 0x8c, 0x85, 0x50, 0x37, 0x8b, 0x97, 0xb5, 0x71, 0xf9,
+	0xf5, 0xea, 0x30, 0x6b, 0x49, 0x56, 0xe3, 0x13, 0x28, 0xba, 0x96, 0x2f, 0x23, 0x38, 0x27, 0x8a,
+	0xef, 0x07, 0x93, 0x1b, 0xb8, 0x6b, 0xf9, 0x42, 0x69, 0xc3, 0x63, 0x41, 0xdf, 0x9c, 0x71, 0xe5,
+	0x12, 0xbd, 0x80, 0x65, 0xd7, 0xf2, 0xfd, 0x61, 0xa6, 0xce, 0x0b, 0x3b, 0x1f, 0x9e, 0xca, 0x8e,
+	0x9f, 0x61, 0x36, 0x36, 0xb8, 0xe4, 0x0e, 0xef, 0xa7, 0x2c, 0xc7, 0xe4, 0x49, 0xcb, 0x2b, 0xaf,
+	0x67, 0x39, 0x26, 0xed, 0xb8, 0xe5, 0xd4, 0x3e, 0xaa, 0xc1, 0x8a, 0x47, 0xbd, 0x2d, 0xea, 0xed,
+	0x13, 0x8f, 0xf7, 0x5a, 0xab, 0xb7, 0x63, 0xb9, 0x71, 0x47, 0x59, 0x29, 0x8b, 0x9a, 0x1b, 0x79,
+	0x8e, 0xb6, 0x60, 0x71, 0xd0, 0xd0, 0xa5, 0xc7, 0x17, 0xc5, 0xa5, 0x97, 0xf5, 0xb8, 0xf1, 0xeb,
+	0x49, 0xe3, 0xd7, 0x3f, 0x4e, 0x70, 0xe6, 0xc2, 0x40, 0x24, 0x56, 0xf2, 0x04, 0x06, 0x39, 0xb8,
+	0x97, 0x2a, 0xc5, 0x55, 0x9c, 0x9b, 0xb8, 0x14, 0x97, 0x12, 0x45, 0x8d, 0xa4, 0x24, 0xcb, 0x9f,
+	0xab, 0x50, 0x78, 0xd9, 0xc9, 0x3d, 0xcb, 0x25, 0x49, 0x27, 0xe7, 0xdf, 0xe8, 0x1c, 0x14, 0x2c,
+	0x97, 0x46, 0x1e, 0x5b, 0x51, 0x45, 0x6f, 0x90, 0x2b, 0xf4, 0x00, 0x54, 0xfa, 0x4c, 0xb4, 0xe1,
+	0x85, 0x6a, 0xfd, 0xb4, 0x19, 0xac, 0x6f, 0x13, 0xe2, 0x0b, 0xc7, 0x54, 0xfa, 0x0c, 0x3d, 0x86,
+	0x65, 0x9b, 0x10, 0x9f, 0x04, 0xd9, 0x2b, 0xce, 0x0b, 0xc2, 0xb4, 0x11, 0x36, 0xc2, 0xa8, 0xa9,
+	0xc7, 0x79, 0x72, 0x37, 0x7e, 0x58, 0xcd, 0xa5, 0x58, 0x49, 0xea, 0x0a, 0x2b, 0x6b, 0x30, 0x93,
+	0x58, 0x42, 0x45, 0x98, 0xfe, 0xa0, 0xfe, 0xd1, 0xc3, 0x46, 0x69, 0x0a, 0xcd, 0x40, 0xfe, 0x63,
+	0xf3, 0x93, 0x46, 0x49, 0x29, 0x3b, 0x30, 0x9f, 0x49, 0x79, 0x54, 0x82, 0xdc, 0x33, 0xd2, 0x97,
+	0x4c, 0xf0, 0x4f, 0xb4, 0x09, 0xd3, 0xb1, 0x3f, 0xea, 0x29, 0x5a, 0x60, 0x2c, 0x5a, 0x53, 0xdf,
+	0x53, 0xca, 0xdb, 0x70, 0xee, 0xe4, 0xac, 0x3f, 0xc1, 0xe6, 0xd9, 0xb4, 0xcd, 0x62, 0x5a, 0xcb,
+	0xcf, 0x13, 0x2d, 0xc3, 0x19, 0x7c, 0x82, 0x96, 0x9d, 0xb4, 0x96, 0xd7, 0x79, 0x8b, 0x5f, 0xda,
+	0xaf, 0xfd, 0xe8, 0xa8, 0xfe, 0x78, 0xfd, 0x11, 0x5c, 0xfd, 0xc0, 0xf1, 0x6c, 0x4c, 0x23, 0x86,
+	0x5d, 0x1a, 0x10, 0x6c, 0x35, 0xf9, 0xe7, 0xb1, 0x01, 0x44, 0xef, 0x32, 0xe6, 0x87, 0x35, 0xc3,
+	0xe8, 0x38, 0xac, 0x1b, 0x35, 0xf5, 0x16, 0x75, 0x0d, 0xee, 0xc3, 0x06, 0x69, 0xd1, 0xb0, 0x1f,
+	0x32, 0x22, 0x97, 0xd2, 0xa5, 0xcd, 0x79, 0x98, 0x4d, 0x75, 0xcb, 0x4a, 0x19, 0xf2, 0x9b, 0xd4,
+	0xee, 0x9f, 0x94, 0x9e, 0x95, 0x27, 0xb0, 0x28, 0xef, 0xfd, 0x53, 0x87, 0x75, 0x05, 0x6c, 0x01,
+	0xd4, 0xc1, 0x34, 0xa2, 0x3a, 0x36, 0x7a, 0x1f, 0xf2, 0xb6, 0xc5, 0x2c, 0x19, 0xfd, 0x5b, 0x63,
+	0xa3, 0xe7, 0x4a, 0x4c, 0x21, 0xb2, 0x8e, 0x61, 0x36, 0x75, 0x8b, 0x3c, 0x5f, 0x76, 0x1b, 0xe6,
+	0xbd, 0xd2, 0x14, 0x3a, 0x03, 0xb9, 0x7b, 0x3b, 0x8d, 0x92, 0x52, 0xfd, 0xe3, 0x59, 0x38, 0x3f,
+	0x1c, 0xef, 0x43, 0x12, 0xec, 0x3b, 0x2d, 0x82, 0xbe, 0xca, 0x41, 0x61, 0x2b, 0xe0, 0xe5, 0x86,
+	0x6e, 0x4c, 0xcc, 0x79, 0x79, 0x72, 0x91, 0xca, 0x1f, 0xd4, 0xcf, 0xff, 0xf1, 0xef, 0xdf, 0xaa,
+	0xbf, 0x57, 0x2b, 0xbf, 0x53, 0x8d, 0xfd, 0x1b, 0xc9, 0x04, 0x7d, 0xd2, 0xfc, 0x6c, 0x1c, 0xa4,
+	0xa6, 0xa9, 0x43, 0xe3, 0x20, 0x3d, 0x3a, 0x1d, 0x1a, 0x07, 0xa9, 0x27, 0xf3, 0xd0, 0x08, 0x89,
+	0x6f, 0x05, 0x16, 0xa3, 0x81, 0x71, 0x10, 0x65, 0x0e, 0x0e, 0x52, 0x8f, 0xef, 0xa1, 0x71, 0x90,
+	0x79, 0xb1, 0x93, 0x75, 0xea, 0xfc, 0xe5, 0x30, 0x73, 0x68, 0x1c, 0xa4, 0xdf, 0x8f, 0xef, 0x85,
+	0x2c, 0xf0, 0x03, 0xd2, 0x76, 0x5e, 0x18, 0xeb, 0x87, 0xb1, 0x91, 0x94, 0x58, 0x38, 0xac, 0x27,
+	0x1c, 0x36, 0x14, 0x0e, 0x09, 0x64, 0x9d, 0x1c, 0xd5, 0x9c, 0x0f, 0xd1, 0x57, 0x0a, 0x40, 0x7c,
+	0x41, 0x22, 0x71, 0xbe, 0x99, 0x4b, 0x5a, 0x17, 0x77, 0x74, 0xb5, 0xb2, 0x36, 0xe6, 0x86, 0x6a,
+	0xca, 0x3a, 0xfa, 0x19, 0x14, 0x3e, 0xa2, 0xf4, 0x59, 0xe4, 0xa3, 0x45, 0xde, 0xe8, 0xaa, 0xfa,
+	0x6d, 0x5b, 0x66, 0xfb, 0x69, 0x2c, 0xeb, 0xc2, 0xb2, 0x86, 0xbe, 0x35, 0x36, 0x37, 0xf8, 0x0c,
+	0x7f, 0x88, 0x7e, 0xa5, 0x40, 0xe1, 0x13, 0xdf, 0x3e, 0x65, 0xfe, 0x9e, 0x3b, 0xf6, 0xc2, 0x35,
+	0xf8, 0x1f, 0x57, 0x95, 0x1b, 0xc2, 0x8b, 0xb7, 0xcb, 0xaf, 0xe8, 0x05, 0xa7, 0xe1, 0x37, 0x0a,
+	0x14, 0xb6, 0x49, 0x8f, 0x30, 0x72, 0x9c, 0x87, 0x51, 0x66, 0x9e, 0x1c, 0xd5, 0xdf, 0x6e, 0x5e,
+	0x83, 0x05, 0x80, 0xba, 0xef, 0xdc, 0x21, 0xfd, 0x7a, 0xc4, 0xba, 0x68, 0x0a, 0xce, 0x43, 0xe1,
+	0x1e, 0xff, 0xac, 0xa2, 0x79, 0xc8, 0x07, 0xc4, 0xb2, 0x61, 0xfa, 0x79, 0xe0, 0x30, 0x12, 0x53,
+	0xb3, 0xfe, 0xaa, 0xd4, 0xfc, 0x4b, 0x81, 0x99, 0x5b, 0x84, 0x3d, 0x88, 0x48, 0xd0, 0xff, 0x7f,
+	0x92, 0xf3, 0xa5, 0x72, 0x54, 0x37, 0x2b, 0x3b, 0xb0, 0x7a, 0x52, 0x5f, 0x1d, 0x18, 0x9c, 0xb0,
+	0x9f, 0x3e, 0x56, 0x44, 0x74, 0x3a, 0xba, 0x3e, 0x2e, 0xba, 0x9f, 0x70, 0xf5, 0x49, 0x8c, 0x7f,
+	0x55, 0x21, 0xdf, 0x68, 0x75, 0x29, 0x7a, 0xe5, 0xa7, 0xb7, 0xfc, 0xca, 0xc8, 0xca, 0x7f, 0x94,
+	0xa3, 0xfa, 0x17, 0x0a, 0xcc, 0x91, 0x56, 0x97, 0xe2, 0x30, 0x6e, 0x98, 0x30, 0x23, 0x56, 0x81,
+	0xdf, 0x42, 0x4b, 0x0f, 0x23, 0xd7, 0xb5, 0x82, 0x7e, 0x0d, 0x37, 0xe4, 0x56, 0xb9, 0xb4, 0x4d,
+	0xc2, 0x56, 0xe0, 0x88, 0x3f, 0x7d, 0xc5, 0x6e, 0x65, 0x1b, 0x50, 0x96, 0x26, 0xe1, 0xed, 0x84,
+	0xe4, 0x08, 0x6a, 0x3e, 0x1b, 0x4f, 0x0d, 0x77, 0xcd, 0x38, 0x88, 0x7b, 0xca, 0xee, 0x85, 0x4a,
+	0xc9, 0xd8, 0xaf, 0x0e, 0xf0, 0xfc, 0xac, 0x16, 0x3f, 0x8e, 0xbb, 0x08, 0x1d, 0x3b, 0x42, 0x7f,
+	0x56, 0x61, 0x8e, 0xcf, 0x1f, 0xf7, 0x2d, 0xd6, 0x15, 0x3e, 0x7e, 0x33, 0x9d, 0xe6, 0x2f, 0xf1,
+	0xbd, 0x7f, 0xad, 0x54, 0xae, 0x8e, 0x89, 0xee, 0xbb, 0xdc, 0xcd, 0xdd, 0xf7, 0x2b, 0xef, 0x8e,
+	0x4d, 0xff, 0xcc, 0x0f, 0x09, 0x3a, 0x7f, 0x82, 0x79, 0x85, 0xee, 0x3e, 0xa9, 0x7c, 0x9a, 0x8e,
+	0x3a, 0x83, 0x32, 0x4e, 0x18, 0xea, 0x86, 0x15, 0x9d, 0x00, 0xd1, 0x63, 0xae, 0x79, 0xfd, 0xd7,
+	0x01, 0x76, 0xe8, 0xa6, 0xe3, 0xd9, 0x8e, 0xd7, 0x09, 0xd1, 0x85, 0x63, 0xb5, 0xb3, 0x2d, 0x7f,
+	0x98, 0x19, 0x59, 0x56, 0x53, 0xe8, 0x11, 0x9c, 0xe1, 0x03, 0x36, 0x8d, 0x18, 0x1a, 0x01, 0x1a,
+	0x29, 0x7c, 0x51, 0xb0, 0xf8, 0x06, 0x5a, 0x4e, 0x47, 0xc8, 0xa4, 0xb2, 0x2e, 0x94, 0x1a, 0x41,
+	0x40, 0x03, 0x3e, 0x7d, 0x6c, 0x13, 0x66, 0x39, 0xbd, 0x70, 0x62, 0x03, 0x57, 0x85, 0x81, 0xcb,
+	0x68, 0x35, 0x93, 0x38, 0x5c, 0xeb, 0x73, 0x87, 0x75, 0x6d, 0xa9, 0xf5, 0xd7, 0x0a, 0xa0, 0x5b,
+	0x84, 0x0d, 0x4f, 0x3b, 0xef, 0x8c, 0xcd, 0x8b, 0x21, 0x89, 0x91, 0x6e, 0x7c, 0x5b, 0xb8, 0x71,
+	0xa5, 0x72, 0x21, 0xed, 0x06, 0xf7, 0xa0, 0x49, 0xed, 0xbe, 0x71, 0xc0, 0x7b, 0xb1, 0x98, 0x8a,
+	0xd0, 0x17, 0x0a, 0x2c, 0xdd, 0xa7, 0x21, 0xe3, 0x1a, 0x85, 0xa8, 0x70, 0xe4, 0xd5, 0x06, 0xab,
+	0x91, 0xd6, 0x0d, 0x61, 0xfd, 0x1a, 0x4f, 0xd5, 0x97, 0xd6, 0x7d, 0x1a, 0x32, 0xee, 0x81, 0xf8,
+	0x59, 0x2e, 0x76, 0x23, 0x49, 0xb9, 0xf2, 0xd7, 0xca, 0x51, 0xfd, 0x4f, 0x0a, 0x6a, 0x8f, 0x98,
+	0xbe, 0xb0, 0x9d, 0x6a, 0x17, 0x1b, 0x1b, 0xf8, 0x79, 0xd7, 0x69, 0x75, 0x71, 0xd8, 0xa5, 0x51,
+	0xcf, 0xc6, 0x1e, 0x65, 0xb8, 0x49, 0x70, 0x14, 0x12, 0x1b, 0x3b, 0x1e, 0xf6, 0x7b, 0x56, 0x8b,
+	0x60, 0xda, 0xc6, 0xac, 0x4b, 0xb0, 0x4d, 0x5b, 0x91, 0x4b, 0xbc, 0xf8, 0x77, 0x35, 0xdc, 0xa2,
+	0x2e, 0x5f, 0x5c, 0x29, 0x3f, 0x80, 0xb5, 0x93, 0x7a, 0x32, 0x2f, 0xe7, 0x64, 0xde, 0x9b, 0xb0,
+	0xf3, 0x54, 0x9f, 0xc2, 0xd9, 0x96, 0xe5, 0x92, 0xde, 0x96, 0x15, 0x12, 0xa9, 0x83, 0x0f, 0x27,
+	0xc8, 0x84, 0x69, 0xc1, 0xc9, 0xc4, 0x89, 0x74, 0x41, 0x70, 0xb8, 0x8c, 0x96, 0x32, 0x89, 0xc4,
+	0x8f, 0xaa, 0x3f, 0x86, 0xd5, 0xba, 0x47, 0x59, 0x97, 0x04, 0xd2, 0x12, 0xbf, 0xbc, 0x54, 0x51,
+	0x7d, 0x3f, 0x53, 0x62, 0x93, 0x1a, 0x9e, 0xda, 0xfc, 0xe5, 0xf4, 0x51, 0xfd, 0xbf, 0x79, 0xc4,
+	0x60, 0xb9, 0x8e, 0x37, 0x1d, 0xc6, 0xc9, 0x4c, 0x75, 0xa2, 0xc7, 0x70, 0xb6, 0x63, 0xde, 0xdf,
+	0xda, 0xb8, 0x15, 0x47, 0x8e, 0xfd, 0x80, 0x3e, 0x25, 0x2d, 0x36, 0x29, 0x63, 0xe5, 0x92, 0x47,
+	0x3d, 0xf2, 0x43, 0x19, 0x19, 0x47, 0x57, 0x73, 0x37, 0xf4, 0x77, 0xd6, 0x73, 0x8a, 0x9a, 0xaf,
+	0x96, 0x2c, 0xdf, 0xef, 0x39, 0x2d, 0x71, 0x6d, 0xc6, 0xd3, 0x90, 0x7a, 0xd5, 0x73, 0xe9, 0x9d,
+	0x17, 0x1b, 0x6d, 0x4a, 0x37, 0x5c, 0xc7, 0x25, 0xb5, 0x63, 0xc8, 0xda, 0x08, 0xe4, 0xee, 0x97,
+	0x2a, 0x2c, 0x42, 0x71, 0xd3, 0x0a, 0x9d, 0x96, 0x98, 0x1f, 0xd4, 0x19, 0x05, 0x2e, 0x65, 0x26,
+	0x8a, 0xc5, 0x19, 0xb5, 0x5c, 0x7c, 0xbc, 0x51, 0xbf, 0x7f, 0x7b, 0xe3, 0x0e, 0xe9, 0x63, 0x15,
+	0xfe, 0xa9, 0x0c, 0x26, 0x8c, 0xbf, 0x29, 0x33, 0x39, 0x2d, 0x5f, 0x7d, 0x33, 0x09, 0x32, 0xe5,
+	0xb7, 0x41, 0xad, 0x88, 0x75, 0x0d, 0xfe, 0x0f, 0x0d, 0x9c, 0x9f, 0x92, 0xda, 0xda, 0x68, 0x10,
+	0xa3, 0xcf, 0x88, 0xb7, 0xf9, 0x0b, 0x28, 0xc7, 0x03, 0x0b, 0x42, 0xb7, 0x02, 0xcb, 0x63, 0x21,
+	0xe6, 0x0b, 0x6c, 0xb5, 0x5a, 0x24, 0x0c, 0x61, 0x55, 0x8e, 0x31, 0x68, 0x59, 0x1e, 0x8a, 0x55,
+	0x72, 0xba, 0x05, 0xd3, 0x96, 0xed, 0x3a, 0x1e, 0xaa, 0x65, 0x44, 0x3d, 0x3b, 0x03, 0xc3, 0x8c,
+	0x62, 0x01, 0x73, 0x42, 0xc6, 0xfb, 0xe9, 0x3e, 0xc1, 0x8e, 0xd7, 0xa6, 0x81, 0x2b, 0x68, 0x69,
+	0xae, 0xc1, 0x7c, 0x9a, 0x8a, 0xa9, 0xe1, 0xd1, 0xaa, 0x79, 0x6d, 0xe4, 0x70, 0x35, 0x0c, 0x0d,
+	0x6e, 0xc3, 0xf9, 0xbb, 0x2f, 0x6b, 0x28, 0x9d, 0x1a, 0x93, 0xa6, 0xc4, 0x6e, 0x71, 0xd0, 0x5f,
+	0x9a, 0x05, 0x91, 0x95, 0x37, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xa0, 0x3e, 0xc8, 0x49,
+	0x18, 0x00, 0x00,
 }
diff --git a/examples/proto/examplepb/a_bit_of_everything.pb.gw.go b/examples/proto/examplepb/a_bit_of_everything.pb.gw.go
index f863b09ac72..73a7a92a817 100644
--- a/examples/proto/examplepb/a_bit_of_everything.pb.gw.go
+++ b/examples/proto/examplepb/a_bit_of_everything.pb.gw.go
@@ -410,10 +410,27 @@ func request_ABitOfEverythingService_Echo_2(ctx context.Context, marshaler runti
 
 }
 
+var (
+	filter_ABitOfEverythingService_DeepPathEcho_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
+
 func request_ABitOfEverythingService_DeepPathEcho_0(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ABitOfEverything
 	var metadata runtime.ServerMetadata
 
+	if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_ABitOfEverythingService_DeepPathEcho_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := client.DeepPathEcho(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func request_ABitOfEverythingService_DeepPathEcho_1(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq ABitOfEverything
+	var metadata runtime.ServerMetadata
+
 	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
@@ -441,6 +458,37 @@ func request_ABitOfEverythingService_DeepPathEcho_0(ctx context.Context, marshal
 
 }
 
+func request_ABitOfEverythingService_DeepPathEcho_2(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq ABitOfEverything
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	var (
+		val string
+		ok  bool
+		err error
+		_   = err
+	)
+
+	val, ok = pathParams["single_nested.deeper_nested_value.value"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "single_nested.deeper_nested_value.value")
+	}
+
+	err = runtime.PopulateFieldFromPath(&protoReq, "single_nested.deeper_nested_value.value", val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "single_nested.deeper_nested_value.value", err)
+	}
+
+	msg, err := client.DeepPathEcho(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
 func request_ABitOfEverythingService_Timeout_0(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq empty.Empty
 	var metadata runtime.ServerMetadata
@@ -858,6 +906,64 @@ func RegisterABitOfEverythingServiceHandlerClient(ctx context.Context, mux *runt
 
 	})
 
+	mux.Handle("POST", pattern_ABitOfEverythingService_DeepPathEcho_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		if cn, ok := w.(http.CloseNotifier); ok {
+			go func(done <-chan struct{}, closed <-chan bool) {
+				select {
+				case <-done:
+				case <-closed:
+					cancel()
+				}
+			}(ctx.Done(), cn.CloseNotify())
+		}
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ABitOfEverythingService_DeepPathEcho_1(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ABitOfEverythingService_DeepPathEcho_1(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	mux.Handle("POST", pattern_ABitOfEverythingService_DeepPathEcho_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		if cn, ok := w.(http.CloseNotifier); ok {
+			go func(done <-chan struct{}, closed <-chan bool) {
+				select {
+				case <-done:
+				case <-closed:
+					cancel()
+				}
+			}(ctx.Done(), cn.CloseNotify())
+		}
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ABitOfEverythingService_DeepPathEcho_2(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ABitOfEverythingService_DeepPathEcho_2(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	mux.Handle("GET", pattern_ABitOfEverythingService_Timeout_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -996,7 +1102,11 @@ var (
 
 	pattern_ABitOfEverythingService_Echo_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "example", "echo"}, ""))
 
-	pattern_ABitOfEverythingService_DeepPathEcho_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "example", "a_bit_of_everything", "single_nested.name"}, ""))
+	pattern_ABitOfEverythingService_DeepPathEcho_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "example", "a_bit_of_everything;echo"}, ""))
+
+	pattern_ABitOfEverythingService_DeepPathEcho_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "example", "a_bit_of_everything", "single_nested.name"}, ""))
+
+	pattern_ABitOfEverythingService_DeepPathEcho_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"v2", "example", "single_nested", "deeper_nested_value", "single_nested.deeper_nested_value.value"}, ""))
 
 	pattern_ABitOfEverythingService_Timeout_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "example", "timeout"}, ""))
 
@@ -1028,6 +1138,10 @@ var (
 
 	forward_ABitOfEverythingService_DeepPathEcho_0 = runtime.ForwardResponseMessage
 
+	forward_ABitOfEverythingService_DeepPathEcho_1 = runtime.ForwardResponseMessage
+
+	forward_ABitOfEverythingService_DeepPathEcho_2 = runtime.ForwardResponseMessage
+
 	forward_ABitOfEverythingService_Timeout_0 = runtime.ForwardResponseMessage
 
 	forward_ABitOfEverythingService_ErrorWithDetails_0 = runtime.ForwardResponseMessage
diff --git a/examples/proto/examplepb/a_bit_of_everything.proto b/examples/proto/examplepb/a_bit_of_everything.proto
index 6eaa7d8fd9a..03a1937f373 100644
--- a/examples/proto/examplepb/a_bit_of_everything.proto
+++ b/examples/proto/examplepb/a_bit_of_everything.proto
@@ -98,7 +98,7 @@ option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
 
 
 // Intentionaly complicated message type to cover much features of Protobuf.
-// NEXT ID: 30
+// NEXT ID: 31
 message ABitOfEverything {
 	option (grpc.gateway.protoc_gen_swagger.options.openapiv2_schema) = {
 		external_docs: {
@@ -108,6 +108,7 @@ message ABitOfEverything {
 	};
 
 	// Nested is nested type.
+	// NEXT ID: 5
 	message Nested {
 		// name is nested field.
 		string name = 1;
@@ -120,6 +121,8 @@ message ABitOfEverything {
 			TRUE = 1;
 		}
 		DeepEnum ok = 3;
+
+		sub.StringMessage deeper_nested_value = 4;
 	}
 	Nested single_nested = 25;
 
@@ -143,8 +146,9 @@ message ABitOfEverything {
 	sint64 sint64_value = 18;
 	repeated string repeated_string_value = 19;
 	oneof oneof_value {
-		google.protobuf.Empty oneof_empty = 20;
-		string oneof_string = 21;
+		/* tag 20 is reserved */
+		string oneof_value_string = 21;
+		Nested oneof_value_nested = 30;
 	}
 
 	map<string, NumericEnum> map_value = 22;
@@ -275,8 +279,17 @@ service ABitOfEverythingService {
 	}
 	rpc DeepPathEcho(ABitOfEverything) returns (ABitOfEverything) {
 		option (google.api.http) = {
-			post: "/v1/example/a_bit_of_everything/{single_nested.name}"
-			body: "*"
+			post: "/v1/example/a_bit_of_everything;echo"
+
+			// Covers 2nd or even deeper level fields in path parameters.
+			additional_bindings {
+				post: "/v1/example/a_bit_of_everything/{single_nested.name}"
+				body: "*"
+			}
+			additional_bindings {
+				post: "/v2/example/single_nested/deeper_nested_value/{single_nested.deeper_nested_value.value}"
+				body: "*"
+			}
 		};
 	}
 	rpc NoBindings(google.protobuf.Duration) returns (google.protobuf.Empty) {}
diff --git a/examples/proto/examplepb/a_bit_of_everything.swagger.json b/examples/proto/examplepb/a_bit_of_everything.swagger.json
index aa7f2479021..f5194f90726 100644
--- a/examples/proto/examplepb/a_bit_of_everything.swagger.json
+++ b/examples/proto/examplepb/a_bit_of_everything.swagger.json
@@ -124,6 +124,12 @@
             ],
             "default": "FALSE"
           },
+          {
+            "name": "single_nested.deeper_nested_value.value",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
           {
             "name": "float_value",
             "in": "query",
@@ -250,7 +256,40 @@
             }
           },
           {
-            "name": "oneof_string",
+            "name": "oneof_value_string",
+            "description": "tag 20 is reserved.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "oneof_value_nested.name",
+            "description": "name is nested field.",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "oneof_value_nested.amount",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "format": "int64"
+          },
+          {
+            "name": "oneof_value_nested.ok",
+            "description": " - FALSE: FALSE is false.\n - TRUE: TRUE is true.",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "enum": [
+              "FALSE",
+              "TRUE"
+            ],
+            "default": "FALSE"
+          },
+          {
+            "name": "oneof_value_nested.deeper_nested_value.value",
             "in": "query",
             "required": false,
             "type": "string"
@@ -416,7 +455,7 @@
     },
     "/v1/example/a_bit_of_everything/{single_nested.name}": {
       "post": {
-        "operationId": "DeepPathEcho",
+        "operationId": "DeepPathEcho2",
         "responses": {
           "200": {
             "description": "",
@@ -531,6 +570,22 @@
         ]
       }
     },
+    "/v1/example/a_bit_of_everything;echo": {
+      "post": {
+        "operationId": "DeepPathEcho",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        },
+        "tags": [
+          "ABitOfEverythingService"
+        ]
+      }
+    },
     "/v2/example/echo": {
       "get": {
         "summary": "Summary: Echo rpc",
@@ -657,6 +712,38 @@
         ]
       }
     },
+    "/v2/example/single_nested/deeper_nested_value/{single_nested.deeper_nested_value.value}": {
+      "post": {
+        "operationId": "DeepPathEcho3",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "single_nested.deeper_nested_value.value",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        ],
+        "tags": [
+          "ABitOfEverythingService"
+        ]
+      }
+    },
     "/v2/example/timeout": {
       "get": {
         "operationId": "Timeout",
@@ -720,9 +807,12 @@
         },
         "ok": {
           "$ref": "#/definitions/NestedDeepEnum"
+        },
+        "deeper_nested_value": {
+          "$ref": "#/definitions/subStringMessage"
         }
       },
-      "description": "Nested is nested type."
+      "title": "Nested is nested type.\nNEXT ID: 5"
     },
     "NestedDeepEnum": {
       "type": "string",
@@ -816,11 +906,12 @@
             "type": "string"
           }
         },
-        "oneof_empty": {
-          "$ref": "#/definitions/protobufEmpty"
+        "oneof_value_string": {
+          "type": "string",
+          "title": "tag 20 is reserved"
         },
-        "oneof_string": {
-          "type": "string"
+        "oneof_value_nested": {
+          "$ref": "#/definitions/ABitOfEverythingNested"
         },
         "map_value": {
           "type": "object",
@@ -855,7 +946,7 @@
           "title": "repeated enum value. it is comma-separated in query"
         }
       },
-      "title": "Intentionaly complicated message type to cover much features of Protobuf.\nNEXT ID: 30",
+      "title": "Intentionaly complicated message type to cover much features of Protobuf.\nNEXT ID: 31",
       "externalDocs": {
         "description": "Find out more about ABitOfEverything",
         "url": "https://github.com/grpc-ecosystem/grpc-gateway"
diff --git a/runtime/marshal_json_test.go b/runtime/marshal_json_test.go
index 6ab9699e48c..b74af53c31a 100644
--- a/runtime/marshal_json_test.go
+++ b/runtime/marshal_json_test.go
@@ -219,7 +219,7 @@ var (
 			json: "ONE",
 		},
 		{
-			data: &examplepb.ABitOfEverything_OneofString{OneofString: "abc"},
+			data: &examplepb.ABitOfEverything_OneofValueString{OneofValueString: "abc"},
 			json: `"abc"`,
 		},
 		{
diff --git a/runtime/marshal_jsonpb_test.go b/runtime/marshal_jsonpb_test.go
index 679283b4511..c18fa90f50f 100644
--- a/runtime/marshal_jsonpb_test.go
+++ b/runtime/marshal_jsonpb_test.go
@@ -34,8 +34,8 @@ func TestJSONPbMarshal(t *testing.T) {
 		},
 		Uint64Value: 0xFFFFFFFFFFFFFFFF,
 		EnumValue:   examplepb.NumericEnum_ONE,
-		OneofValue: &examplepb.ABitOfEverything_OneofString{
-			OneofString: "bar",
+		OneofValue: &examplepb.ABitOfEverything_OneofValueString{
+			OneofValueString: "bar",
 		},
 		MapValue: map[string]examplepb.NumericEnum{
 			"a": examplepb.NumericEnum_ONE,
@@ -157,7 +157,7 @@ func TestJSONPbUnmarshal(t *testing.T) {
 			],
 			"uint64Value": 18446744073709551615,
 			"enumValue": "ONE",
-			"oneofString": "bar",
+			"oneofValueString": "bar",
 			"mapValue": {
 				"a": 1,
 				"b": 0
@@ -170,7 +170,7 @@ func TestJSONPbUnmarshal(t *testing.T) {
 			],
 			"uint64Value": "18446744073709551615",
 			"enumValue": "ONE",
-			"oneofString": "bar",
+			"oneofValueString": "bar",
 			"mapValue": {
 				"a": 1,
 				"b": 0
@@ -183,7 +183,7 @@ func TestJSONPbUnmarshal(t *testing.T) {
 			],
 			"uint64Value": 18446744073709551615,
 			"enumValue": 1,
-			"oneofString": "bar",
+			"oneofValueString": "bar",
 			"mapValue": {
 				"a": 1,
 				"b": 0
@@ -204,8 +204,8 @@ func TestJSONPbUnmarshal(t *testing.T) {
 			},
 			Uint64Value: 0xFFFFFFFFFFFFFFFF,
 			EnumValue:   examplepb.NumericEnum_ONE,
-			OneofValue: &examplepb.ABitOfEverything_OneofString{
-				OneofString: "bar",
+			OneofValue: &examplepb.ABitOfEverything_OneofValueString{
+				OneofValueString: "bar",
 			},
 			MapValue: map[string]examplepb.NumericEnum{
 				"a": examplepb.NumericEnum_ONE,
@@ -252,8 +252,8 @@ func TestJSONPbEncoder(t *testing.T) {
 			},
 		},
 		Uint64Value: 0xFFFFFFFFFFFFFFFF,
-		OneofValue: &examplepb.ABitOfEverything_OneofString{
-			OneofString: "bar",
+		OneofValue: &examplepb.ABitOfEverything_OneofValueString{
+			OneofValueString: "bar",
 		},
 		MapValue: map[string]examplepb.NumericEnum{
 			"a": examplepb.NumericEnum_ONE,
@@ -375,7 +375,7 @@ func TestJSONPbDecoder(t *testing.T) {
 			],
 			"uint64Value": 18446744073709551615,
 			"enumValue": "ONE",
-			"oneofString": "bar",
+			"oneofValueString": "bar",
 			"mapValue": {
 				"a": 1,
 				"b": 0
@@ -388,7 +388,7 @@ func TestJSONPbDecoder(t *testing.T) {
 			],
 			"uint64Value": "18446744073709551615",
 			"enumValue": "ONE",
-			"oneofString": "bar",
+			"oneofValueString": "bar",
 			"mapValue": {
 				"a": 1,
 				"b": 0
@@ -401,7 +401,7 @@ func TestJSONPbDecoder(t *testing.T) {
 			],
 			"uint64Value": 18446744073709551615,
 			"enumValue": 1,
-			"oneofString": "bar",
+			"oneofValueString": "bar",
 			"mapValue": {
 				"a": 1,
 				"b": 0
@@ -424,8 +424,8 @@ func TestJSONPbDecoder(t *testing.T) {
 			},
 			Uint64Value: 0xFFFFFFFFFFFFFFFF,
 			EnumValue:   examplepb.NumericEnum_ONE,
-			OneofValue: &examplepb.ABitOfEverything_OneofString{
-				OneofString: "bar",
+			OneofValue: &examplepb.ABitOfEverything_OneofValueString{
+				OneofValueString: "bar",
 			},
 			MapValue: map[string]examplepb.NumericEnum{
 				"a": examplepb.NumericEnum_ONE,
diff --git a/runtime/marshal_proto_test.go b/runtime/marshal_proto_test.go
index 535f3991d9d..eae06dbe450 100644
--- a/runtime/marshal_proto_test.go
+++ b/runtime/marshal_proto_test.go
@@ -26,8 +26,8 @@ var message = &examplepb.ABitOfEverything{
 	},
 	Uint64Value: 0xFFFFFFFFFFFFFFFF,
 	EnumValue:   examplepb.NumericEnum_ONE,
-	OneofValue: &examplepb.ABitOfEverything_OneofString{
-		OneofString: "bar",
+	OneofValue: &examplepb.ABitOfEverything_OneofValueString{
+		OneofValueString: "bar",
 	},
 	MapValue: map[string]examplepb.NumericEnum{
 		"a": examplepb.NumericEnum_ONE,

From 9733504b3787064ab178cff3fe4ea7dabc94dd2b Mon Sep 17 00:00:00 2001
From: Yuki Yugui Sonoda <yugui@yugui.jp>
Date: Mon, 30 Apr 2018 20:38:31 +0900
Subject: [PATCH 2/7] Add description comments to clarify purpose of
 integration tests

---
 examples/integration/integration_test.go      | 32 +++++++++++++++++++
 .../proto/examplepb/a_bit_of_everything.proto | 20 ++++++++++++
 runtime/query.go                              |  6 ++++
 3 files changed, 58 insertions(+)

diff --git a/examples/integration/integration_test.go b/examples/integration/integration_test.go
index 73dec2cb4ff..76f7b831062 100644
--- a/examples/integration/integration_test.go
+++ b/examples/integration/integration_test.go
@@ -29,6 +29,8 @@ type errorBody struct {
 	Details []interface{} `json:"details"`
 }
 
+// TestEcho tests the most fundamental functionalities of marshaling requests
+// an unmarshaling responses.
 func TestEcho(t *testing.T) {
 	if testing.Short() {
 		t.Skip()
@@ -68,6 +70,7 @@ func TestForwardResponseOption(t *testing.T) {
 	testEcho(t, 8081, "application/vnd.docker.plugins.v1.1+json")
 }
 
+// testEcho is a part of TestEcho which deals with path parameters
 func testEcho(t *testing.T, port int, contentType string) {
 	url := fmt.Sprintf("http://localhost:%d/v1/example/echo/myid", port)
 	resp, err := http.Post(url, "application/json", strings.NewReader("{}"))
@@ -200,6 +203,7 @@ func testEchoOneof2(t *testing.T, port int, contentType string) {
 	}
 }
 
+// testEchoBody is a part of TestEcho which deals with a body parameter.
 func testEchoBody(t *testing.T, port int) {
 	sent := gw.SimpleMessage{Id: "example"}
 	var m jsonpb.Marshaler
@@ -250,6 +254,11 @@ func testEchoBody(t *testing.T, port int) {
 	}
 }
 
+// TestABE covers more than TestEcho.
+// It covers (1) various HTTP methods; (2) various HTTP status codes
+// (3) streaming requests and responses; (4) various types of fields;
+// (5) various depths of nested fields; and (6) even more features like
+// additional_bindings
 func TestABE(t *testing.T) {
 	if testing.Short() {
 		t.Skip()
@@ -267,6 +276,7 @@ func TestABE(t *testing.T) {
 	testAdditionalBindings(t, 8080)
 }
 
+// testABECreate tests path parameters with various types of fields.
 func testABECreate(t *testing.T, port int) {
 	want := gw.ABitOfEverything{
 		FloatValue:               1.5,
@@ -318,6 +328,7 @@ func testABECreate(t *testing.T, port int) {
 	}
 }
 
+// testABECreateBody tests body parameters with various types of fields.
 func testABECreateBody(t *testing.T, port int) {
 	want := gw.ABitOfEverything{
 		FloatValue:               1.5,
@@ -401,6 +412,7 @@ func testABECreateBody(t *testing.T, port int) {
 	}
 }
 
+// testABEBulkCreate tests client-streaming
 func testABEBulkCreate(t *testing.T, port int) {
 	count := 0
 	r, w := io.Pipe()
@@ -488,6 +500,7 @@ func testABEBulkCreate(t *testing.T, port int) {
 	}
 }
 
+// testABELookup tests unary call
 func testABELookup(t *testing.T, port int) {
 	url := fmt.Sprintf("http://localhost:%d/v1/example/a_bit_of_everything", port)
 	cresp, err := http.Post(url, "application/json", strings.NewReader(`
@@ -543,6 +556,8 @@ func testABELookup(t *testing.T, port int) {
 	}
 }
 
+// testABELookupNotFound tests HTTP status codes other than StatusOK.
+// More coverage on status codes should be done in runtime/error_test.go.
 func testABELookupNotFound(t *testing.T, port int) {
 	url := fmt.Sprintf("http://localhost:%d/v1/example/a_bit_of_everything", port)
 	uuid := "not_exist"
@@ -593,6 +608,7 @@ func testABELookupNotFound(t *testing.T, port int) {
 	}
 }
 
+// testABEList tests server-streaming.
 func testABEList(t *testing.T, port int) {
 	url := fmt.Sprintf("http://localhost:%d/v1/example/a_bit_of_everything", port)
 	resp, err := http.Get(url)
@@ -644,6 +660,7 @@ func testABEList(t *testing.T, port int) {
 	}
 }
 
+// testABEBulkEcho tests bidi-streaming
 func testABEBulkEcho(t *testing.T, port int) {
 	reqr, reqw := io.Pipe()
 	var wg sync.WaitGroup
@@ -722,6 +739,8 @@ func testABEBulkEcho(t *testing.T, port int) {
 	}
 }
 
+// testABEBulkEchoZeroLength covers an edge case of testABEBulkEcho that the length of
+// the chunked stream is zero.
 func testABEBulkEchoZeroLength(t *testing.T, port int) {
 	url := fmt.Sprintf("http://localhost:%d/v1/example/a_bit_of_everything/echo", port)
 	req, err := http.NewRequest("POST", url, bytes.NewReader(nil))
@@ -754,6 +773,8 @@ func testABEBulkEchoZeroLength(t *testing.T, port int) {
 	}
 }
 
+// testAdditionalBindings tests if additional_bindings works as fine as the
+// primary binding.
 func testAdditionalBindings(t *testing.T, port int) {
 	for i, f := range []func() *http.Response{
 		func() *http.Response {
@@ -887,6 +908,8 @@ func TestDeepFields(t *testing.T) {
 	}
 }
 
+// TestTimeout tests if timeout metadata propagates to the grpc backend server.
+// TODO(yugui) Check if the timeout is actually earlier than the default HTTP timeout.
 func TestTimeout(t *testing.T) {
 	url := "http://localhost:8080/v2/example/timeout"
 	req, err := http.NewRequest("GET", url, nil)
@@ -907,6 +930,8 @@ func TestTimeout(t *testing.T) {
 	}
 }
 
+// TestErrorWithDetails tests error details set by grpc server are available
+// in the HTTP response.
 func TestErrorWithDetails(t *testing.T) {
 	url := "http://localhost:8080/v2/example/errorwithdetails"
 	resp, err := http.Get(url)
@@ -967,6 +992,9 @@ func TestErrorWithDetails(t *testing.T) {
 	}
 }
 
+// TestPostWithEmptyBody covers an edge-case that the request body is empty.
+// It should be valid, in particular, all fields are specified in path
+// parameters and query parameters.
 func TestPostWithEmptyBody(t *testing.T) {
 	url := "http://localhost:8080/v2/example/postwithemptybody/name"
 	rep, err := http.Post(url, "application/json", nil)
@@ -983,6 +1011,7 @@ func TestPostWithEmptyBody(t *testing.T) {
 	}
 }
 
+// TestUnknownPath tests if the router rejects unknown paths.
 func TestUnknownPath(t *testing.T) {
 	url := "http://localhost:8080"
 	resp, err := http.Post(url, "application/json", strings.NewReader("{}"))
@@ -1003,6 +1032,8 @@ func TestUnknownPath(t *testing.T) {
 	}
 }
 
+// TestUnknownPath tests if the router rejects unsupported methods on a
+// known path.
 func TestMethodNotAllowed(t *testing.T) {
 	url := "http://localhost:8080/v1/example/echo/myid"
 	resp, err := http.Get(url)
@@ -1023,6 +1054,7 @@ func TestMethodNotAllowed(t *testing.T) {
 	}
 }
 
+// TestInvalidArgument tests if the decoder rejects a malformed path parameter.
 func TestInvalidArgument(t *testing.T) {
 	url := "http://localhost:8080/v1/example/echo/myid/not_int64"
 	resp, err := http.Get(url)
diff --git a/examples/proto/examplepb/a_bit_of_everything.proto b/examples/proto/examplepb/a_bit_of_everything.proto
index 03a1937f373..3f0f8a83cae 100644
--- a/examples/proto/examplepb/a_bit_of_everything.proto
+++ b/examples/proto/examplepb/a_bit_of_everything.proto
@@ -193,18 +193,26 @@ service ABitOfEverythingService {
 		}
 	};
 
+	// Covers all types of fields in path parameters.
+
 	rpc Create(ABitOfEverything) returns (ABitOfEverything) {
 		// TODO add enum_value
 		option (google.api.http) = {
 			post: "/v1/example/a_bit_of_everything/{float_value}/{double_value}/{int64_value}/separator/{uint64_value}/{int32_value}/{fixed64_value}/{fixed32_value}/{bool_value}/{string_value=strprefix/*}/{uint32_value}/{sfixed32_value}/{sfixed64_value}/{sint32_value}/{sint64_value}/{nonConventionalNameValue}"
 		};
 	}
+
+	// Covers all types of fields in the request body.
+
 	rpc CreateBody(ABitOfEverything) returns (ABitOfEverything) {
 		option (google.api.http) = {
 			post: "/v1/example/a_bit_of_everything"
 			body: "*"
 		};
 	}
+
+	// Covers other request methods
+
 	rpc Lookup(sub2.IdMessage) returns (ABitOfEverything) {
 		option (google.api.http) = {
 			get: "/v1/example/a_bit_of_everything/{uuid}"
@@ -236,6 +244,9 @@ service ABitOfEverythingService {
 		  }
 		};
 	}
+
+	// Covers all types of fields in query parameters
+
 	rpc GetQuery(ABitOfEverything) returns (google.protobuf.Empty) {
 		option (google.api.http) = {
 			get: "/v1/example/a_bit_of_everything/query/{uuid}"
@@ -248,6 +259,7 @@ service ABitOfEverythingService {
 		  }
 		};
 	}
+
 	// Echo allows posting a StringMessage value.
 	//
 	// It also exposes multiple bindings.
@@ -256,8 +268,16 @@ service ABitOfEverythingService {
 	// description exposes documentation correctly on all paths
 	// defined as additional_bindings in the proto.
 	rpc Echo(grpc.gateway.examples.sub.StringMessage) returns (grpc.gateway.examples.sub.StringMessage) {
+		// Covers:
+		// 1. additional_bindings feature
+		// 2. non-'*' body
+		// 3. messages defined in another package than the service
 		option (google.api.http) = {
 			get: "/v1/example/a_bit_of_everything/echo/{value}"
+
+			// additonal bindings can have different ways of parameter bindings
+			// and HTTP methods.
+
 			additional_bindings {
 				post: "/v2/example/echo"
 				body: "value"
diff --git a/runtime/query.go b/runtime/query.go
index 07d0ff8c5bf..6fa5c2ad2de 100644
--- a/runtime/query.go
+++ b/runtime/query.go
@@ -30,6 +30,12 @@ func PopulateQueryParameters(msg proto.Message, values url.Values, filter *utili
 		}
 		fieldPath := strings.Split(key, ".")
 		if filter.HasCommonPrefix(fieldPath) {
+			// Query parameters never overwrite explicitly declared parameters.
+			// ref. https://groups.google.com/d/msg/grpc-io/Xqx80hG0D44/1gwmwBcnNScJ
+			//
+			// ref. https://github.com/googleapis/googleapis/blob/master/google/api/http.proto#L73
+			// > Any fields in the request message which are not bound by the path
+			// > pattern automatically become (optional) HTTP query
 			continue
 		}
 		if err := populateFieldValueFromPath(msg, fieldPath, values); err != nil {

From 2e7b5ee0bf083c47f306160f1186bf8e309cd127 Mon Sep 17 00:00:00 2001
From: Yuki Yugui Sonoda <yugui@yugui.jp>
Date: Mon, 30 Apr 2018 20:44:22 +0900
Subject: [PATCH 3/7] Add more tests for oneof fields in path parameters

---
 .../clients/abe/a_bit_of_everything_nested.go |   4 +
 .../abe/a_bit_of_everything_service_api.go    | 401 +++++++++++++++++-
 examples/integration/client_test.go           |   2 +
 examples/integration/integration_test.go      | 101 ++++-
 .../proto/examplepb/a_bit_of_everything.pb.go | 380 +++++++++++------
 .../examplepb/a_bit_of_everything.pb.gw.go    | 345 ++++++++++++++-
 .../proto/examplepb/a_bit_of_everything.proto |  30 +-
 .../a_bit_of_everything.swagger.json          | 200 ++++++++-
 8 files changed, 1321 insertions(+), 142 deletions(-)

diff --git a/examples/clients/abe/a_bit_of_everything_nested.go b/examples/clients/abe/a_bit_of_everything_nested.go
index 70433451211..de6c99569cf 100644
--- a/examples/clients/abe/a_bit_of_everything_nested.go
+++ b/examples/clients/abe/a_bit_of_everything_nested.go
@@ -20,4 +20,8 @@ type ABitOfEverythingNested struct {
 	Ok NestedDeepEnum `json:"ok,omitempty"`
 
 	DeeperNestedValue SubStringMessage `json:"deeper_nested_value,omitempty"`
+
+	OneofValueDeeperNested SubStringMessage `json:"oneof_value_deeper_nested,omitempty"`
+
+	OneofValueTerminal string `json:"oneof_value_terminal,omitempty"`
 }
diff --git a/examples/clients/abe/a_bit_of_everything_service_api.go b/examples/clients/abe/a_bit_of_everything_service_api.go
index 180c6b18b4d..64c9ece37e1 100644
--- a/examples/clients/abe/a_bit_of_everything_service_api.go
+++ b/examples/clients/abe/a_bit_of_everything_service_api.go
@@ -55,14 +55,15 @@ func NewABitOfEverythingServiceApiWithBasePath(basePath string) *ABitOfEverythin
  * @param sfixed64Value 
  * @param sint32Value 
  * @param sint64Value 
+ * @param oneofValueString 
  * @param nonConventionalNameValue 
  * @return *ExamplepbABitOfEverything
  */
-func (a ABitOfEverythingServiceApi) Create(floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, stringValue string, uint32Value int64, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, nonConventionalNameValue string) (*ExamplepbABitOfEverything, *APIResponse, error) {
+func (a ABitOfEverythingServiceApi) Create(floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, stringValue string, uint32Value int64, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, oneofValueString string, nonConventionalNameValue string) (*ExamplepbABitOfEverything, *APIResponse, error) {
 
 	var localVarHttpMethod = strings.ToUpper("Post")
 	// create path and map variables
-	localVarPath := a.Configuration.BasePath + "/v1/example/a_bit_of_everything/{float_value}/{double_value}/{int64_value}/separator/{uint64_value}/{int32_value}/{fixed64_value}/{fixed32_value}/{bool_value}/{string_value}/{uint32_value}/{sfixed32_value}/{sfixed64_value}/{sint32_value}/{sint64_value}/{nonConventionalNameValue}"
+	localVarPath := a.Configuration.BasePath + "/v1/example/a_bit_of_everything/{float_value}/{double_value}/{int64_value}/separator/{uint64_value}/{int32_value}/{fixed64_value}/{fixed32_value}/{bool_value}/{string_value}/{uint32_value}/{sfixed32_value}/{sfixed64_value}/{sint32_value}/{sint64_value}/{oneof_value_string}/{nonConventionalNameValue}"
 	localVarPath = strings.Replace(localVarPath, "{"+"float_value"+"}", fmt.Sprintf("%v", floatValue), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"double_value"+"}", fmt.Sprintf("%v", doubleValue), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"int64_value"+"}", fmt.Sprintf("%v", int64Value), -1)
@@ -77,6 +78,7 @@ func (a ABitOfEverythingServiceApi) Create(floatValue float32, doubleValue float
 	localVarPath = strings.Replace(localVarPath, "{"+"sfixed64_value"+"}", fmt.Sprintf("%v", sfixed64Value), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"sint32_value"+"}", fmt.Sprintf("%v", sint32Value), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"sint64_value"+"}", fmt.Sprintf("%v", sint64Value), -1)
+	localVarPath = strings.Replace(localVarPath, "{"+"oneof_value_string"+"}", fmt.Sprintf("%v", oneofValueString), -1)
 	localVarPath = strings.Replace(localVarPath, "{"+"nonConventionalNameValue"+"}", fmt.Sprintf("%v", nonConventionalNameValue), -1)
 
 	localVarHeaderParams := make(map[string]string)
@@ -441,6 +443,391 @@ func (a ABitOfEverythingServiceApi) DeepPathEcho3(singleNestedDeeperNestedValueV
 	return successPayload, localVarAPIResponse, err
 }
 
+/**
+ * 
+ *
+ * @param oneofValueString 
+ * @param body 
+ * @return *ExamplepbABitOfEverything
+ */
+func (a ABitOfEverythingServiceApi) DeepPathEcho4(oneofValueString string, body ExamplepbABitOfEverything) (*ExamplepbABitOfEverything, *APIResponse, error) {
+
+	var localVarHttpMethod = strings.ToUpper("Post")
+	// create path and map variables
+	localVarPath := a.Configuration.BasePath + "/v2/example/oneof_value_string/echo/{oneof_value_string}"
+	localVarPath = strings.Replace(localVarPath, "{"+"oneof_value_string"+"}", fmt.Sprintf("%v", oneofValueString), -1)
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := url.Values{}
+	localVarFormParams := make(map[string]string)
+	var localVarPostBody interface{}
+	var localVarFileName string
+	var localVarFileBytes []byte
+	// authentication '(OAuth2)' required
+	// oauth required
+	if a.Configuration.AccessToken != ""{
+		localVarHeaderParams["Authorization"] =  "Bearer " + a.Configuration.AccessToken
+	}
+	// authentication '(BasicAuth)' required
+	// http basic authentication required
+	if a.Configuration.Username != "" || a.Configuration.Password != ""{
+		localVarHeaderParams["Authorization"] =  "Basic " + a.Configuration.GetBasicAuthEncodedString()
+	}
+	// authentication '(ApiKeyAuth)' required
+	// set key with prefix in header
+	localVarHeaderParams["X-API-Key"] = a.Configuration.GetAPIKeyWithPrefix("X-API-Key")
+	// add default headers if any
+	for key := range a.Configuration.DefaultHeader {
+		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
+	}
+
+	// to determine the Content-Type header
+	localVarHttpContentTypes := []string{ "application/json", "application/x-foo-mime",  }
+
+	// set Content-Type header
+	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
+	if localVarHttpContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHttpContentType
+	}
+	// to determine the Accept header
+	localVarHttpHeaderAccepts := []string{
+		"application/json",
+		"application/x-foo-mime",
+		}
+
+	// set Accept header
+	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+	if localVarHttpHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
+	}
+	// body params
+	localVarPostBody = &body
+	var successPayload = new(ExamplepbABitOfEverything)
+	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
+
+	var localVarURL, _ = url.Parse(localVarPath)
+	localVarURL.RawQuery = localVarQueryParams.Encode()
+	var localVarAPIResponse = &APIResponse{Operation: "DeepPathEcho4", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
+	if localVarHttpResponse != nil {
+		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
+		localVarAPIResponse.Payload = localVarHttpResponse.Body()
+	}
+
+	if err != nil {
+		return successPayload, localVarAPIResponse, err
+	}
+	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
+	return successPayload, localVarAPIResponse, err
+}
+
+/**
+ * 
+ *
+ * @param oneofValueNestedName 
+ * @param body 
+ * @return *ExamplepbABitOfEverything
+ */
+func (a ABitOfEverythingServiceApi) DeepPathEcho5(oneofValueNestedName string, body ExamplepbABitOfEverything) (*ExamplepbABitOfEverything, *APIResponse, error) {
+
+	var localVarHttpMethod = strings.ToUpper("Post")
+	// create path and map variables
+	localVarPath := a.Configuration.BasePath + "/v2/example/oneof_value_nested/name/echo/{oneof_value_nested.name}"
+	localVarPath = strings.Replace(localVarPath, "{"+"oneof_value_nested.name"+"}", fmt.Sprintf("%v", oneofValueNestedName), -1)
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := url.Values{}
+	localVarFormParams := make(map[string]string)
+	var localVarPostBody interface{}
+	var localVarFileName string
+	var localVarFileBytes []byte
+	// authentication '(OAuth2)' required
+	// oauth required
+	if a.Configuration.AccessToken != ""{
+		localVarHeaderParams["Authorization"] =  "Bearer " + a.Configuration.AccessToken
+	}
+	// authentication '(BasicAuth)' required
+	// http basic authentication required
+	if a.Configuration.Username != "" || a.Configuration.Password != ""{
+		localVarHeaderParams["Authorization"] =  "Basic " + a.Configuration.GetBasicAuthEncodedString()
+	}
+	// authentication '(ApiKeyAuth)' required
+	// set key with prefix in header
+	localVarHeaderParams["X-API-Key"] = a.Configuration.GetAPIKeyWithPrefix("X-API-Key")
+	// add default headers if any
+	for key := range a.Configuration.DefaultHeader {
+		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
+	}
+
+	// to determine the Content-Type header
+	localVarHttpContentTypes := []string{ "application/json", "application/x-foo-mime",  }
+
+	// set Content-Type header
+	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
+	if localVarHttpContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHttpContentType
+	}
+	// to determine the Accept header
+	localVarHttpHeaderAccepts := []string{
+		"application/json",
+		"application/x-foo-mime",
+		}
+
+	// set Accept header
+	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+	if localVarHttpHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
+	}
+	// body params
+	localVarPostBody = &body
+	var successPayload = new(ExamplepbABitOfEverything)
+	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
+
+	var localVarURL, _ = url.Parse(localVarPath)
+	localVarURL.RawQuery = localVarQueryParams.Encode()
+	var localVarAPIResponse = &APIResponse{Operation: "DeepPathEcho5", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
+	if localVarHttpResponse != nil {
+		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
+		localVarAPIResponse.Payload = localVarHttpResponse.Body()
+	}
+
+	if err != nil {
+		return successPayload, localVarAPIResponse, err
+	}
+	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
+	return successPayload, localVarAPIResponse, err
+}
+
+/**
+ * 
+ *
+ * @param oneofValueNestedDeeperNestedValueValue 
+ * @param body 
+ * @return *ExamplepbABitOfEverything
+ */
+func (a ABitOfEverythingServiceApi) DeepPathEcho6(oneofValueNestedDeeperNestedValueValue string, body ExamplepbABitOfEverything) (*ExamplepbABitOfEverything, *APIResponse, error) {
+
+	var localVarHttpMethod = strings.ToUpper("Post")
+	// create path and map variables
+	localVarPath := a.Configuration.BasePath + "/v2/example/oneof_value_nested/deeper_nested_value/value/echo/{oneof_value_nested.deeper_nested_value.value}"
+	localVarPath = strings.Replace(localVarPath, "{"+"oneof_value_nested.deeper_nested_value.value"+"}", fmt.Sprintf("%v", oneofValueNestedDeeperNestedValueValue), -1)
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := url.Values{}
+	localVarFormParams := make(map[string]string)
+	var localVarPostBody interface{}
+	var localVarFileName string
+	var localVarFileBytes []byte
+	// authentication '(OAuth2)' required
+	// oauth required
+	if a.Configuration.AccessToken != ""{
+		localVarHeaderParams["Authorization"] =  "Bearer " + a.Configuration.AccessToken
+	}
+	// authentication '(BasicAuth)' required
+	// http basic authentication required
+	if a.Configuration.Username != "" || a.Configuration.Password != ""{
+		localVarHeaderParams["Authorization"] =  "Basic " + a.Configuration.GetBasicAuthEncodedString()
+	}
+	// authentication '(ApiKeyAuth)' required
+	// set key with prefix in header
+	localVarHeaderParams["X-API-Key"] = a.Configuration.GetAPIKeyWithPrefix("X-API-Key")
+	// add default headers if any
+	for key := range a.Configuration.DefaultHeader {
+		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
+	}
+
+	// to determine the Content-Type header
+	localVarHttpContentTypes := []string{ "application/json", "application/x-foo-mime",  }
+
+	// set Content-Type header
+	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
+	if localVarHttpContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHttpContentType
+	}
+	// to determine the Accept header
+	localVarHttpHeaderAccepts := []string{
+		"application/json",
+		"application/x-foo-mime",
+		}
+
+	// set Accept header
+	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+	if localVarHttpHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
+	}
+	// body params
+	localVarPostBody = &body
+	var successPayload = new(ExamplepbABitOfEverything)
+	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
+
+	var localVarURL, _ = url.Parse(localVarPath)
+	localVarURL.RawQuery = localVarQueryParams.Encode()
+	var localVarAPIResponse = &APIResponse{Operation: "DeepPathEcho6", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
+	if localVarHttpResponse != nil {
+		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
+		localVarAPIResponse.Payload = localVarHttpResponse.Body()
+	}
+
+	if err != nil {
+		return successPayload, localVarAPIResponse, err
+	}
+	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
+	return successPayload, localVarAPIResponse, err
+}
+
+/**
+ * 
+ *
+ * @param oneofValueNestedOneofValueTerminal 
+ * @param body 
+ * @return *ExamplepbABitOfEverything
+ */
+func (a ABitOfEverythingServiceApi) DeepPathEcho7(oneofValueNestedOneofValueTerminal string, body ExamplepbABitOfEverything) (*ExamplepbABitOfEverything, *APIResponse, error) {
+
+	var localVarHttpMethod = strings.ToUpper("Post")
+	// create path and map variables
+	localVarPath := a.Configuration.BasePath + "/v2/example/oneof_value_nested/oneof_value_terminal/echo/{oneof_value_nested.oneof_value_terminal}"
+	localVarPath = strings.Replace(localVarPath, "{"+"oneof_value_nested.oneof_value_terminal"+"}", fmt.Sprintf("%v", oneofValueNestedOneofValueTerminal), -1)
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := url.Values{}
+	localVarFormParams := make(map[string]string)
+	var localVarPostBody interface{}
+	var localVarFileName string
+	var localVarFileBytes []byte
+	// authentication '(OAuth2)' required
+	// oauth required
+	if a.Configuration.AccessToken != ""{
+		localVarHeaderParams["Authorization"] =  "Bearer " + a.Configuration.AccessToken
+	}
+	// authentication '(BasicAuth)' required
+	// http basic authentication required
+	if a.Configuration.Username != "" || a.Configuration.Password != ""{
+		localVarHeaderParams["Authorization"] =  "Basic " + a.Configuration.GetBasicAuthEncodedString()
+	}
+	// authentication '(ApiKeyAuth)' required
+	// set key with prefix in header
+	localVarHeaderParams["X-API-Key"] = a.Configuration.GetAPIKeyWithPrefix("X-API-Key")
+	// add default headers if any
+	for key := range a.Configuration.DefaultHeader {
+		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
+	}
+
+	// to determine the Content-Type header
+	localVarHttpContentTypes := []string{ "application/json", "application/x-foo-mime",  }
+
+	// set Content-Type header
+	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
+	if localVarHttpContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHttpContentType
+	}
+	// to determine the Accept header
+	localVarHttpHeaderAccepts := []string{
+		"application/json",
+		"application/x-foo-mime",
+		}
+
+	// set Accept header
+	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+	if localVarHttpHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
+	}
+	// body params
+	localVarPostBody = &body
+	var successPayload = new(ExamplepbABitOfEverything)
+	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
+
+	var localVarURL, _ = url.Parse(localVarPath)
+	localVarURL.RawQuery = localVarQueryParams.Encode()
+	var localVarAPIResponse = &APIResponse{Operation: "DeepPathEcho7", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
+	if localVarHttpResponse != nil {
+		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
+		localVarAPIResponse.Payload = localVarHttpResponse.Body()
+	}
+
+	if err != nil {
+		return successPayload, localVarAPIResponse, err
+	}
+	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
+	return successPayload, localVarAPIResponse, err
+}
+
+/**
+ * 
+ *
+ * @param oneofValueNestedOneofValueDeeperNestedValue 
+ * @param body 
+ * @return *ExamplepbABitOfEverything
+ */
+func (a ABitOfEverythingServiceApi) DeepPathEcho8(oneofValueNestedOneofValueDeeperNestedValue string, body ExamplepbABitOfEverything) (*ExamplepbABitOfEverything, *APIResponse, error) {
+
+	var localVarHttpMethod = strings.ToUpper("Post")
+	// create path and map variables
+	localVarPath := a.Configuration.BasePath + "/v2/example/oneof_value_nested/oneof_value_deeper_nested/value/echo/{oneof_value_nested.oneof_value_deeper_nested.value}"
+	localVarPath = strings.Replace(localVarPath, "{"+"oneof_value_nested.oneof_value_deeper_nested.value"+"}", fmt.Sprintf("%v", oneofValueNestedOneofValueDeeperNestedValue), -1)
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := url.Values{}
+	localVarFormParams := make(map[string]string)
+	var localVarPostBody interface{}
+	var localVarFileName string
+	var localVarFileBytes []byte
+	// authentication '(OAuth2)' required
+	// oauth required
+	if a.Configuration.AccessToken != ""{
+		localVarHeaderParams["Authorization"] =  "Bearer " + a.Configuration.AccessToken
+	}
+	// authentication '(BasicAuth)' required
+	// http basic authentication required
+	if a.Configuration.Username != "" || a.Configuration.Password != ""{
+		localVarHeaderParams["Authorization"] =  "Basic " + a.Configuration.GetBasicAuthEncodedString()
+	}
+	// authentication '(ApiKeyAuth)' required
+	// set key with prefix in header
+	localVarHeaderParams["X-API-Key"] = a.Configuration.GetAPIKeyWithPrefix("X-API-Key")
+	// add default headers if any
+	for key := range a.Configuration.DefaultHeader {
+		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
+	}
+
+	// to determine the Content-Type header
+	localVarHttpContentTypes := []string{ "application/json", "application/x-foo-mime",  }
+
+	// set Content-Type header
+	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
+	if localVarHttpContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHttpContentType
+	}
+	// to determine the Accept header
+	localVarHttpHeaderAccepts := []string{
+		"application/json",
+		"application/x-foo-mime",
+		}
+
+	// set Accept header
+	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+	if localVarHttpHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
+	}
+	// body params
+	localVarPostBody = &body
+	var successPayload = new(ExamplepbABitOfEverything)
+	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
+
+	var localVarURL, _ = url.Parse(localVarPath)
+	localVarURL.RawQuery = localVarQueryParams.Encode()
+	var localVarAPIResponse = &APIResponse{Operation: "DeepPathEcho8", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
+	if localVarHttpResponse != nil {
+		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
+		localVarAPIResponse.Payload = localVarHttpResponse.Body()
+	}
+
+	if err != nil {
+		return successPayload, localVarAPIResponse, err
+	}
+	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
+	return successPayload, localVarAPIResponse, err
+}
+
 /**
  * 
  *
@@ -667,6 +1054,8 @@ func (a ABitOfEverythingServiceApi) GetMessageWithBody(id string, body Examplepb
  * @param singleNestedAmount 
  * @param singleNestedOk  - FALSE: FALSE is false.  - TRUE: TRUE is true.
  * @param singleNestedDeeperNestedValueValue 
+ * @param singleNestedOneofValueDeeperNestedValue 
+ * @param singleNestedOneofValueTerminal 
  * @param floatValue 
  * @param doubleValue 
  * @param int64Value 
@@ -689,12 +1078,14 @@ func (a ABitOfEverythingServiceApi) GetMessageWithBody(id string, body Examplepb
  * @param oneofValueNestedAmount 
  * @param oneofValueNestedOk  - FALSE: FALSE is false.  - TRUE: TRUE is true.
  * @param oneofValueNestedDeeperNestedValueValue 
+ * @param oneofValueNestedOneofValueDeeperNestedValue 
+ * @param oneofValueNestedOneofValueTerminal 
  * @param nonConventionalNameValue 
  * @param timestampValue 
  * @param repeatedEnumValue repeated enum value. it is comma-separated in query.   - ZERO: ZERO means 0  - ONE: ONE means 1
  * @return *ProtobufEmpty
  */
-func (a ABitOfEverythingServiceApi) GetQuery(uuid string, singleNestedName string, singleNestedAmount int64, singleNestedOk string, singleNestedDeeperNestedValueValue string, floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, stringValue string, bytesValue string, uint32Value int64, enumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofValueString string, oneofValueNestedName string, oneofValueNestedAmount int64, oneofValueNestedOk string, oneofValueNestedDeeperNestedValueValue string, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string) (*ProtobufEmpty, *APIResponse, error) {
+func (a ABitOfEverythingServiceApi) GetQuery(uuid string, singleNestedName string, singleNestedAmount int64, singleNestedOk string, singleNestedDeeperNestedValueValue string, singleNestedOneofValueDeeperNestedValue string, singleNestedOneofValueTerminal string, floatValue float32, doubleValue float64, int64Value string, uint64Value string, int32Value int32, fixed64Value string, fixed32Value int64, boolValue bool, stringValue string, bytesValue string, uint32Value int64, enumValue string, sfixed32Value int32, sfixed64Value string, sint32Value int32, sint64Value string, repeatedStringValue []string, oneofValueString string, oneofValueNestedName string, oneofValueNestedAmount int64, oneofValueNestedOk string, oneofValueNestedDeeperNestedValueValue string, oneofValueNestedOneofValueDeeperNestedValue string, oneofValueNestedOneofValueTerminal string, nonConventionalNameValue string, timestampValue time.Time, repeatedEnumValue []string) (*ProtobufEmpty, *APIResponse, error) {
 
 	var localVarHttpMethod = strings.ToUpper("Get")
 	// create path and map variables
@@ -728,6 +1119,8 @@ func (a ABitOfEverythingServiceApi) GetQuery(uuid string, singleNestedName strin
 	localVarQueryParams.Add("single_nested.amount", a.Configuration.APIClient.ParameterToString(singleNestedAmount, ""))
 	localVarQueryParams.Add("single_nested.ok", a.Configuration.APIClient.ParameterToString(singleNestedOk, ""))
 	localVarQueryParams.Add("single_nested.deeper_nested_value.value", a.Configuration.APIClient.ParameterToString(singleNestedDeeperNestedValueValue, ""))
+	localVarQueryParams.Add("single_nested.oneof_value_deeper_nested.value", a.Configuration.APIClient.ParameterToString(singleNestedOneofValueDeeperNestedValue, ""))
+	localVarQueryParams.Add("single_nested.oneof_value_terminal", a.Configuration.APIClient.ParameterToString(singleNestedOneofValueTerminal, ""))
 	localVarQueryParams.Add("float_value", a.Configuration.APIClient.ParameterToString(floatValue, ""))
 	localVarQueryParams.Add("double_value", a.Configuration.APIClient.ParameterToString(doubleValue, ""))
 	localVarQueryParams.Add("int64_value", a.Configuration.APIClient.ParameterToString(int64Value, ""))
@@ -752,6 +1145,8 @@ func (a ABitOfEverythingServiceApi) GetQuery(uuid string, singleNestedName strin
 	localVarQueryParams.Add("oneof_value_nested.amount", a.Configuration.APIClient.ParameterToString(oneofValueNestedAmount, ""))
 	localVarQueryParams.Add("oneof_value_nested.ok", a.Configuration.APIClient.ParameterToString(oneofValueNestedOk, ""))
 	localVarQueryParams.Add("oneof_value_nested.deeper_nested_value.value", a.Configuration.APIClient.ParameterToString(oneofValueNestedDeeperNestedValueValue, ""))
+	localVarQueryParams.Add("oneof_value_nested.oneof_value_deeper_nested.value", a.Configuration.APIClient.ParameterToString(oneofValueNestedOneofValueDeeperNestedValue, ""))
+	localVarQueryParams.Add("oneof_value_nested.oneof_value_terminal", a.Configuration.APIClient.ParameterToString(oneofValueNestedOneofValueTerminal, ""))
 	localVarQueryParams.Add("nonConventionalNameValue", a.Configuration.APIClient.ParameterToString(nonConventionalNameValue, ""))
 	localVarQueryParams.Add("timestamp_value", a.Configuration.APIClient.ParameterToString(timestampValue, ""))
 	var repeatedEnumValueCollectionFormat = "csv"
diff --git a/examples/integration/client_test.go b/examples/integration/client_test.go
index 8850d58eaac..4f405ec29c7 100644
--- a/examples/integration/client_test.go
+++ b/examples/integration/client_test.go
@@ -72,6 +72,7 @@ func testABEClientCreate(t *testing.T, cl *abe.ABitOfEverythingServiceApi) {
 		Sfixed64Value:            "-4611686018427387904",
 		Sint32Value:              2147483647,
 		Sint64Value:              "4611686018427387903",
+		OneofValueString:         "bar",
 		NonConventionalNameValue: "camelCase",
 	}
 	resp, _, err := cl.Create(
@@ -89,6 +90,7 @@ func testABEClientCreate(t *testing.T, cl *abe.ABitOfEverythingServiceApi) {
 		want.Sfixed64Value,
 		want.Sint32Value,
 		want.Sint64Value,
+		want.OneofValueString,
 		want.NonConventionalNameValue,
 	)
 	if err != nil {
diff --git a/examples/integration/integration_test.go b/examples/integration/integration_test.go
index 76f7b831062..2387e135cd3 100644
--- a/examples/integration/integration_test.go
+++ b/examples/integration/integration_test.go
@@ -278,6 +278,7 @@ func TestABE(t *testing.T) {
 
 // testABECreate tests path parameters with various types of fields.
 func testABECreate(t *testing.T, port int) {
+	const oneofStr = "bar"
 	want := gw.ABitOfEverything{
 		FloatValue:               1.5,
 		DoubleValue:              2.5,
@@ -293,9 +294,10 @@ func testABECreate(t *testing.T, port int) {
 		Sfixed64Value:            -4611686018427387904,
 		Sint32Value:              2147483647,
 		Sint64Value:              4611686018427387903,
+		OneofValue:               &gw.ABitOfEverything_OneofValueString{oneofStr},
 		NonConventionalNameValue: "camelCase",
 	}
-	url := fmt.Sprintf("http://localhost:%d/v1/example/a_bit_of_everything/%f/%f/%d/separator/%d/%d/%d/%d/%v/%s/%d/%d/%d/%d/%d/%s", port, want.FloatValue, want.DoubleValue, want.Int64Value, want.Uint64Value, want.Int32Value, want.Fixed64Value, want.Fixed32Value, want.BoolValue, want.StringValue, want.Uint32Value, want.Sfixed32Value, want.Sfixed64Value, want.Sint32Value, want.Sint64Value, want.NonConventionalNameValue)
+	url := fmt.Sprintf("http://localhost:%d/v1/example/a_bit_of_everything/%f/%f/%d/separator/%d/%d/%d/%d/%v/%s/%d/%d/%d/%d/%d/%s/%s", port, want.FloatValue, want.DoubleValue, want.Int64Value, want.Uint64Value, want.Int32Value, want.Fixed64Value, want.Fixed32Value, want.BoolValue, want.StringValue, want.Uint32Value, want.Sfixed32Value, want.Sfixed64Value, want.Sint32Value, want.Sint64Value, oneofStr, want.NonConventionalNameValue)
 
 	resp, err := http.Post(url, "application/json", strings.NewReader("{}"))
 	if err != nil {
@@ -908,6 +910,103 @@ func TestDeepFields(t *testing.T) {
 	}
 }
 
+func TestOneof(t *testing.T) {
+	const base = "http://localhost:8080"
+
+	for i, spec := range []struct {
+		path    string
+		payload string
+		want    gw.ABitOfEverything
+	}{
+		// path param: primitive field in a oneof clause.
+		{
+			path: "/v2/example/oneof_value_string/echo/foo",
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueString{"foo"},
+			},
+		},
+		// path param: primitive field in a message field in a oneof clause
+		{
+			path: "/v2/example/oneof_value_nested/name/echo/foo",
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueNested{
+					&gw.ABitOfEverything_Nested{
+						Name: "foo",
+					},
+				},
+			},
+		},
+		// path param: primitive field in a message field in a message field in a oneof clause
+		{
+			path: "/v2/example/oneof_value_nested/deeper_nested_value/value/echo/foo",
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueNested{
+					&gw.ABitOfEverything_Nested{
+						DeeperNestedValue: &sub.StringMessage{
+							Value: proto.String("foo"),
+						},
+					},
+				},
+			},
+		},
+		// path param: primitive field in a oneof clause in a message field in a oneof clause.
+		{
+			path: "/v2/example/oneof_value_nested/oneof_value_terminal/echo/foo",
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueNested{
+					&gw.ABitOfEverything_Nested{
+						OneofValue: &gw.ABitOfEverything_Nested_OneofValueTerminal{
+							"foo",
+						},
+					},
+				},
+			},
+		},
+		// path param: primitive field in a message field in a oneof clause in a message field in a oneof clause.
+		{
+			path: "/v2/example/oneof_value_nested/oneof_value_deeper_nested/value/echo/foo",
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueNested{
+					&gw.ABitOfEverything_Nested{
+						OneofValue: &gw.ABitOfEverything_Nested_OneofValueDeeperNested{
+							&sub.StringMessage{
+								Value: proto.String("foo"),
+							},
+						},
+					},
+				},
+			},
+		},
+	} {
+		url := base + spec.path
+		resp, err := http.Post(url, "application/json", strings.NewReader(spec.payload))
+		if err != nil {
+			t.Errorf("http.Post(%q) failed with %v; want success; at i=%d", url, err, i)
+			return
+		}
+		defer resp.Body.Close()
+		buf, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			t.Errorf("iotuil.ReadAll(resp.Body) failed with %v; want success; at i=%d", err, i)
+			return
+		}
+
+		if got, want := resp.StatusCode, http.StatusOK; got != want {
+			t.Errorf("resp.StatusCode = %d; want %d; at i=%d", got, want, i)
+			t.Logf("%s", buf)
+		}
+
+		var got gw.ABitOfEverything
+		if err := jsonpb.UnmarshalString(string(buf), &got); err != nil {
+			t.Errorf("jsonpb.UnmarshalString(%s, &msg) failed with %v; want success; at i=%d", buf, err, i)
+			return
+		}
+		if !reflect.DeepEqual(got, spec.want) {
+			t.Errorf("got = %v; want %v; at i=%d", &got, &spec.want, i)
+		}
+	}
+}
+
 // TestTimeout tests if timeout metadata propagates to the grpc backend server.
 // TODO(yugui) Check if the timeout is actually earlier than the default HTTP timeout.
 func TestTimeout(t *testing.T) {
diff --git a/examples/proto/examplepb/a_bit_of_everything.pb.go b/examples/proto/examplepb/a_bit_of_everything.pb.go
index ce3e635b6e3..d6c340d5f5b 100644
--- a/examples/proto/examplepb/a_bit_of_everything.pb.go
+++ b/examples/proto/examplepb/a_bit_of_everything.pb.go
@@ -403,13 +403,17 @@ func _ABitOfEverything_OneofSizer(msg proto.Message) (n int) {
 }
 
 // Nested is nested type.
-// NEXT ID: 5
+// NEXT ID: 7
 type ABitOfEverything_Nested struct {
 	// name is nested field.
 	Name              string                                   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 	Amount            uint32                                   `protobuf:"varint,2,opt,name=amount" json:"amount,omitempty"`
 	Ok                ABitOfEverything_Nested_DeepEnum         `protobuf:"varint,3,opt,name=ok,enum=grpc.gateway.examples.examplepb.ABitOfEverything_Nested_DeepEnum" json:"ok,omitempty"`
 	DeeperNestedValue *grpc_gateway_examples_sub.StringMessage `protobuf:"bytes,4,opt,name=deeper_nested_value,json=deeperNestedValue" json:"deeper_nested_value,omitempty"`
+	// Types that are valid to be assigned to OneofValue:
+	//	*ABitOfEverything_Nested_OneofValueDeeperNested
+	//	*ABitOfEverything_Nested_OneofValueTerminal
+	OneofValue isABitOfEverything_Nested_OneofValue `protobuf_oneof:"oneof_value"`
 }
 
 func (m *ABitOfEverything_Nested) Reset()                    { *m = ABitOfEverything_Nested{} }
@@ -417,6 +421,27 @@ func (m *ABitOfEverything_Nested) String() string            { return proto.Comp
 func (*ABitOfEverything_Nested) ProtoMessage()               {}
 func (*ABitOfEverything_Nested) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
 
+type isABitOfEverything_Nested_OneofValue interface {
+	isABitOfEverything_Nested_OneofValue()
+}
+
+type ABitOfEverything_Nested_OneofValueDeeperNested struct {
+	OneofValueDeeperNested *grpc_gateway_examples_sub.StringMessage `protobuf:"bytes,15,opt,name=oneof_value_deeper_nested,json=oneofValueDeeperNested,oneof"`
+}
+type ABitOfEverything_Nested_OneofValueTerminal struct {
+	OneofValueTerminal string `protobuf:"bytes,16,opt,name=oneof_value_terminal,json=oneofValueTerminal,oneof"`
+}
+
+func (*ABitOfEverything_Nested_OneofValueDeeperNested) isABitOfEverything_Nested_OneofValue() {}
+func (*ABitOfEverything_Nested_OneofValueTerminal) isABitOfEverything_Nested_OneofValue()     {}
+
+func (m *ABitOfEverything_Nested) GetOneofValue() isABitOfEverything_Nested_OneofValue {
+	if m != nil {
+		return m.OneofValue
+	}
+	return nil
+}
+
 func (m *ABitOfEverything_Nested) GetName() string {
 	if m != nil {
 		return m.Name
@@ -445,6 +470,90 @@ func (m *ABitOfEverything_Nested) GetDeeperNestedValue() *grpc_gateway_examples_
 	return nil
 }
 
+func (m *ABitOfEverything_Nested) GetOneofValueDeeperNested() *grpc_gateway_examples_sub.StringMessage {
+	if x, ok := m.GetOneofValue().(*ABitOfEverything_Nested_OneofValueDeeperNested); ok {
+		return x.OneofValueDeeperNested
+	}
+	return nil
+}
+
+func (m *ABitOfEverything_Nested) GetOneofValueTerminal() string {
+	if x, ok := m.GetOneofValue().(*ABitOfEverything_Nested_OneofValueTerminal); ok {
+		return x.OneofValueTerminal
+	}
+	return ""
+}
+
+// XXX_OneofFuncs is for the internal use of the proto package.
+func (*ABitOfEverything_Nested) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
+	return _ABitOfEverything_Nested_OneofMarshaler, _ABitOfEverything_Nested_OneofUnmarshaler, _ABitOfEverything_Nested_OneofSizer, []interface{}{
+		(*ABitOfEverything_Nested_OneofValueDeeperNested)(nil),
+		(*ABitOfEverything_Nested_OneofValueTerminal)(nil),
+	}
+}
+
+func _ABitOfEverything_Nested_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
+	m := msg.(*ABitOfEverything_Nested)
+	// oneof_value
+	switch x := m.OneofValue.(type) {
+	case *ABitOfEverything_Nested_OneofValueDeeperNested:
+		b.EncodeVarint(15<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.OneofValueDeeperNested); err != nil {
+			return err
+		}
+	case *ABitOfEverything_Nested_OneofValueTerminal:
+		b.EncodeVarint(16<<3 | proto.WireBytes)
+		b.EncodeStringBytes(x.OneofValueTerminal)
+	case nil:
+	default:
+		return fmt.Errorf("ABitOfEverything_Nested.OneofValue has unexpected type %T", x)
+	}
+	return nil
+}
+
+func _ABitOfEverything_Nested_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
+	m := msg.(*ABitOfEverything_Nested)
+	switch tag {
+	case 15: // oneof_value.oneof_value_deeper_nested
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(grpc_gateway_examples_sub.StringMessage)
+		err := b.DecodeMessage(msg)
+		m.OneofValue = &ABitOfEverything_Nested_OneofValueDeeperNested{msg}
+		return true, err
+	case 16: // oneof_value.oneof_value_terminal
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		x, err := b.DecodeStringBytes()
+		m.OneofValue = &ABitOfEverything_Nested_OneofValueTerminal{x}
+		return true, err
+	default:
+		return false, nil
+	}
+}
+
+func _ABitOfEverything_Nested_OneofSizer(msg proto.Message) (n int) {
+	m := msg.(*ABitOfEverything_Nested)
+	// oneof_value
+	switch x := m.OneofValue.(type) {
+	case *ABitOfEverything_Nested_OneofValueDeeperNested:
+		s := proto.Size(x.OneofValueDeeperNested)
+		n += proto.SizeVarint(15<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(s))
+		n += s
+	case *ABitOfEverything_Nested_OneofValueTerminal:
+		n += proto.SizeVarint(16<<3 | proto.WireBytes)
+		n += proto.SizeVarint(uint64(len(x.OneofValueTerminal)))
+		n += len(x.OneofValueTerminal)
+	case nil:
+	default:
+		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
+	}
+	return n
+}
+
 type Body struct {
 	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 }
@@ -1107,135 +1216,142 @@ var _AnotherServiceWithNoBindings_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("examples/proto/examplepb/a_bit_of_everything.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 2067 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x1b, 0xc7,
-	0x15, 0xd7, 0x2e, 0x29, 0x5a, 0x7c, 0xfa, 0xa2, 0x46, 0x8e, 0x2d, 0xd3, 0xb2, 0x35, 0x66, 0x9c,
-	0x76, 0xad, 0x58, 0xbb, 0x31, 0x1d, 0x14, 0x09, 0x8b, 0x7e, 0x50, 0x12, 0xe3, 0x18, 0x8e, 0x65,
-	0x7b, 0x9d, 0x38, 0x86, 0xea, 0x54, 0x58, 0x72, 0x87, 0xe4, 0xda, 0xdc, 0x9d, 0xed, 0xee, 0xac,
-	0x6c, 0x56, 0x55, 0x8b, 0x26, 0x40, 0x8b, 0x9c, 0x0a, 0xa8, 0xf7, 0x5c, 0x0a, 0xf4, 0xd6, 0x3f,
-	0xa0, 0x28, 0x8a, 0xdc, 0xda, 0x43, 0x6f, 0x2d, 0xd0, 0x7b, 0x81, 0x9e, 0x7a, 0xec, 0x5f, 0x50,
-	0xcc, 0xec, 0x2c, 0xbd, 0x4b, 0x89, 0xa0, 0x29, 0x17, 0xb9, 0xd8, 0x3b, 0x33, 0xbf, 0xf7, 0xf5,
-	0x9b, 0xf7, 0xde, 0x3c, 0x11, 0xaa, 0xe4, 0x85, 0xe5, 0xfa, 0x3d, 0x12, 0x1a, 0x7e, 0x40, 0x19,
-	0x35, 0xe4, 0xd2, 0x6f, 0x1a, 0xd6, 0x5e, 0xd3, 0x61, 0x7b, 0xb4, 0xbd, 0x47, 0xf6, 0x49, 0xd0,
-	0x67, 0x5d, 0xc7, 0xeb, 0xe8, 0x02, 0x83, 0xd6, 0x3a, 0x81, 0xdf, 0xd2, 0x3b, 0x16, 0x23, 0xcf,
-	0xad, 0xbe, 0x9e, 0x28, 0xd0, 0x07, 0xa2, 0xe5, 0xd5, 0x0e, 0xa5, 0x9d, 0x1e, 0x31, 0x2c, 0xdf,
-	0x31, 0x2c, 0xcf, 0xa3, 0xcc, 0x62, 0x0e, 0xf5, 0xc2, 0x58, 0xbc, 0x7c, 0x51, 0x9e, 0x8a, 0x55,
-	0x33, 0x6a, 0x1b, 0xc4, 0xf5, 0x59, 0x5f, 0x1e, 0x5e, 0x1e, 0x3e, 0xb4, 0xa3, 0x40, 0x48, 0xcb,
-	0x73, 0x3c, 0xe4, 0x6f, 0x18, 0x35, 0x0d, 0x97, 0x84, 0xa1, 0xd5, 0x21, 0x12, 0x71, 0xe5, 0x38,
-	0xa2, 0x3a, 0x04, 0x59, 0x1b, 0x36, 0xc2, 0x1c, 0x97, 0x84, 0xcc, 0x72, 0x7d, 0x09, 0xb8, 0x2e,
-	0xfe, 0x6b, 0x6d, 0x74, 0x88, 0xb7, 0x11, 0x3e, 0xb7, 0x3a, 0x1d, 0x12, 0x18, 0xd4, 0x17, 0x41,
-	0x1c, 0x0f, 0xa8, 0xf2, 0xf7, 0x25, 0x28, 0xd5, 0x37, 0x1d, 0x76, 0xaf, 0xdd, 0x18, 0x50, 0x85,
-	0x3e, 0x83, 0xf9, 0xd0, 0xf1, 0x3a, 0x3d, 0xb2, 0xe7, 0x91, 0x90, 0x11, 0x7b, 0xe5, 0x02, 0x56,
-	0xb4, 0xd9, 0xea, 0x7b, 0xfa, 0x18, 0xf2, 0xf4, 0x61, 0x4d, 0xfa, 0x8e, 0x90, 0x37, 0xe7, 0x62,
-	0x75, 0xf1, 0x0a, 0x21, 0xc8, 0x47, 0x91, 0x63, 0xaf, 0x28, 0x58, 0xd1, 0x8a, 0xa6, 0xf8, 0x46,
-	0xf7, 0xa1, 0x20, 0x6d, 0xa9, 0x38, 0xf7, 0x5a, 0xb6, 0xa4, 0x1e, 0xb4, 0x06, 0xb3, 0xed, 0x1e,
-	0xb5, 0xd8, 0xde, 0xbe, 0xd5, 0x8b, 0xc8, 0x4a, 0x0e, 0x2b, 0x9a, 0x6a, 0x82, 0xd8, 0x7a, 0xc4,
-	0x77, 0xd0, 0x15, 0x98, 0xb3, 0x69, 0xd4, 0xec, 0x11, 0x89, 0xc8, 0x63, 0x45, 0x53, 0xcc, 0xd9,
-	0x78, 0x2f, 0x86, 0xac, 0xc1, 0xac, 0xe3, 0xb1, 0xef, 0xbc, 0x2b, 0x11, 0xd3, 0x58, 0xd1, 0x72,
-	0x26, 0x88, 0xad, 0x81, 0x8e, 0x28, 0x8d, 0x28, 0x60, 0x45, 0xcb, 0x9b, 0xb3, 0x51, 0x0a, 0x12,
-	0xeb, 0xb8, 0x59, 0x95, 0x88, 0x33, 0x58, 0xd1, 0xa6, 0x85, 0x8e, 0x9b, 0xd5, 0x18, 0xf0, 0x26,
-	0xcc, 0xb7, 0x9d, 0x17, 0xc4, 0x1e, 0x28, 0x99, 0xc1, 0x8a, 0x56, 0x30, 0xe7, 0xe4, 0x66, 0x16,
-	0x34, 0xd0, 0x53, 0xc4, 0x8a, 0x76, 0x46, 0x82, 0x12, 0x4d, 0x97, 0x00, 0x9a, 0x94, 0xf6, 0x24,
-	0x02, 0xb0, 0xa2, 0xcd, 0x98, 0x45, 0xbe, 0x33, 0x70, 0x36, 0x64, 0x81, 0xe3, 0x75, 0x24, 0x60,
-	0x56, 0xf0, 0x3f, 0x1b, 0xef, 0x0d, 0x9c, 0x6d, 0xf6, 0x19, 0x09, 0x25, 0xe2, 0x12, 0x56, 0xb4,
-	0x39, 0x13, 0xc4, 0x56, 0x26, 0xe0, 0x81, 0x1b, 0xf3, 0x58, 0xd1, 0xe6, 0xe3, 0x80, 0x13, 0x2f,
-	0xee, 0x00, 0x10, 0x2f, 0x72, 0x25, 0x60, 0x01, 0x2b, 0xda, 0x42, 0xf5, 0xfa, 0xd8, 0xeb, 0xdc,
-	0x89, 0x5c, 0x12, 0x38, 0xad, 0x86, 0x17, 0xb9, 0x66, 0x91, 0xcb, 0xc7, 0xca, 0xde, 0x82, 0x85,
-	0x30, 0x1b, 0xf8, 0x22, 0x56, 0xb4, 0x45, 0x73, 0x3e, 0xcc, 0x44, 0x3e, 0x80, 0x0d, 0x48, 0x2c,
-	0x61, 0x45, 0x2b, 0x25, 0xb0, 0xd4, 0x75, 0x85, 0x69, 0xef, 0x97, 0xb0, 0xa2, 0x2d, 0x99, 0xb3,
-	0x61, 0xca, 0x7b, 0x09, 0x19, 0xe8, 0x41, 0x58, 0xd1, 0x50, 0x0c, 0x49, 0xb4, 0x54, 0xe1, 0x8d,
-	0x80, 0xf8, 0xc4, 0x62, 0xc4, 0xde, 0xcb, 0x10, 0xba, 0x8c, 0x73, 0x5a, 0xd1, 0x5c, 0x4e, 0x0e,
-	0x1f, 0xa6, 0x88, 0xd5, 0x01, 0x51, 0x8f, 0xd0, 0x76, 0x8c, 0x94, 0x62, 0x2b, 0x6f, 0xf0, 0x1b,
-	0xf8, 0x70, 0xca, 0x2c, 0x89, 0x33, 0x81, 0x8c, 0x85, 0x50, 0x37, 0x8b, 0x97, 0xb5, 0x71, 0xf9,
-	0xf5, 0xea, 0x30, 0x6b, 0x49, 0x56, 0xe3, 0x13, 0x28, 0xba, 0x96, 0x2f, 0x23, 0x38, 0x27, 0x8a,
-	0xef, 0x07, 0x93, 0x1b, 0xb8, 0x6b, 0xf9, 0x42, 0x69, 0xc3, 0x63, 0x41, 0xdf, 0x9c, 0x71, 0xe5,
-	0x12, 0xbd, 0x80, 0x65, 0xd7, 0xf2, 0xfd, 0x61, 0xa6, 0xce, 0x0b, 0x3b, 0x1f, 0x9e, 0xca, 0x8e,
-	0x9f, 0x61, 0x36, 0x36, 0xb8, 0xe4, 0x0e, 0xef, 0xa7, 0x2c, 0xc7, 0xe4, 0x49, 0xcb, 0x2b, 0xaf,
-	0x67, 0x39, 0x26, 0xed, 0xb8, 0xe5, 0xd4, 0x3e, 0xaa, 0xc1, 0x8a, 0x47, 0xbd, 0x2d, 0xea, 0xed,
-	0x13, 0x8f, 0xf7, 0x5a, 0xab, 0xb7, 0x63, 0xb9, 0x71, 0x47, 0x59, 0x29, 0x8b, 0x9a, 0x1b, 0x79,
-	0x8e, 0xb6, 0x60, 0x71, 0xd0, 0xd0, 0xa5, 0xc7, 0x17, 0xc5, 0xa5, 0x97, 0xf5, 0xb8, 0xf1, 0xeb,
-	0x49, 0xe3, 0xd7, 0x3f, 0x4e, 0x70, 0xe6, 0xc2, 0x40, 0x24, 0x56, 0xf2, 0x04, 0x06, 0x39, 0xb8,
-	0x97, 0x2a, 0xc5, 0x55, 0x9c, 0x9b, 0xb8, 0x14, 0x97, 0x12, 0x45, 0x8d, 0xa4, 0x24, 0xcb, 0x9f,
-	0xab, 0x50, 0x78, 0xd9, 0xc9, 0x3d, 0xcb, 0x25, 0x49, 0x27, 0xe7, 0xdf, 0xe8, 0x1c, 0x14, 0x2c,
-	0x97, 0x46, 0x1e, 0x5b, 0x51, 0x45, 0x6f, 0x90, 0x2b, 0xf4, 0x00, 0x54, 0xfa, 0x4c, 0xb4, 0xe1,
-	0x85, 0x6a, 0xfd, 0xb4, 0x19, 0xac, 0x6f, 0x13, 0xe2, 0x0b, 0xc7, 0x54, 0xfa, 0x0c, 0x3d, 0x86,
-	0x65, 0x9b, 0x10, 0x9f, 0x04, 0xd9, 0x2b, 0xce, 0x0b, 0xc2, 0xb4, 0x11, 0x36, 0xc2, 0xa8, 0xa9,
-	0xc7, 0x79, 0x72, 0x37, 0x7e, 0x58, 0xcd, 0xa5, 0x58, 0x49, 0xea, 0x0a, 0x2b, 0x6b, 0x30, 0x93,
-	0x58, 0x42, 0x45, 0x98, 0xfe, 0xa0, 0xfe, 0xd1, 0xc3, 0x46, 0x69, 0x0a, 0xcd, 0x40, 0xfe, 0x63,
-	0xf3, 0x93, 0x46, 0x49, 0x29, 0x3b, 0x30, 0x9f, 0x49, 0x79, 0x54, 0x82, 0xdc, 0x33, 0xd2, 0x97,
-	0x4c, 0xf0, 0x4f, 0xb4, 0x09, 0xd3, 0xb1, 0x3f, 0xea, 0x29, 0x5a, 0x60, 0x2c, 0x5a, 0x53, 0xdf,
-	0x53, 0xca, 0xdb, 0x70, 0xee, 0xe4, 0xac, 0x3f, 0xc1, 0xe6, 0xd9, 0xb4, 0xcd, 0x62, 0x5a, 0xcb,
-	0xcf, 0x13, 0x2d, 0xc3, 0x19, 0x7c, 0x82, 0x96, 0x9d, 0xb4, 0x96, 0xd7, 0x79, 0x8b, 0x5f, 0xda,
-	0xaf, 0xfd, 0xe8, 0xa8, 0xfe, 0x78, 0xfd, 0x11, 0x5c, 0xfd, 0xc0, 0xf1, 0x6c, 0x4c, 0x23, 0x86,
-	0x5d, 0x1a, 0x10, 0x6c, 0x35, 0xf9, 0xe7, 0xb1, 0x01, 0x44, 0xef, 0x32, 0xe6, 0x87, 0x35, 0xc3,
-	0xe8, 0x38, 0xac, 0x1b, 0x35, 0xf5, 0x16, 0x75, 0x0d, 0xee, 0xc3, 0x06, 0x69, 0xd1, 0xb0, 0x1f,
-	0x32, 0x22, 0x97, 0xd2, 0xa5, 0xcd, 0x79, 0x98, 0x4d, 0x75, 0xcb, 0x4a, 0x19, 0xf2, 0x9b, 0xd4,
-	0xee, 0x9f, 0x94, 0x9e, 0x95, 0x27, 0xb0, 0x28, 0xef, 0xfd, 0x53, 0x87, 0x75, 0x05, 0x6c, 0x01,
-	0xd4, 0xc1, 0x34, 0xa2, 0x3a, 0x36, 0x7a, 0x1f, 0xf2, 0xb6, 0xc5, 0x2c, 0x19, 0xfd, 0x5b, 0x63,
-	0xa3, 0xe7, 0x4a, 0x4c, 0x21, 0xb2, 0x8e, 0x61, 0x36, 0x75, 0x8b, 0x3c, 0x5f, 0x76, 0x1b, 0xe6,
-	0xbd, 0xd2, 0x14, 0x3a, 0x03, 0xb9, 0x7b, 0x3b, 0x8d, 0x92, 0x52, 0xfd, 0xe3, 0x59, 0x38, 0x3f,
-	0x1c, 0xef, 0x43, 0x12, 0xec, 0x3b, 0x2d, 0x82, 0xbe, 0xca, 0x41, 0x61, 0x2b, 0xe0, 0xe5, 0x86,
-	0x6e, 0x4c, 0xcc, 0x79, 0x79, 0x72, 0x91, 0xca, 0x1f, 0xd4, 0xcf, 0xff, 0xf1, 0xef, 0xdf, 0xaa,
-	0xbf, 0x57, 0x2b, 0xbf, 0x53, 0x8d, 0xfd, 0x1b, 0xc9, 0x04, 0x7d, 0xd2, 0xfc, 0x6c, 0x1c, 0xa4,
-	0xa6, 0xa9, 0x43, 0xe3, 0x20, 0x3d, 0x3a, 0x1d, 0x1a, 0x07, 0xa9, 0x27, 0xf3, 0xd0, 0x08, 0x89,
-	0x6f, 0x05, 0x16, 0xa3, 0x81, 0x71, 0x10, 0x65, 0x0e, 0x0e, 0x52, 0x8f, 0xef, 0xa1, 0x71, 0x90,
-	0x79, 0xb1, 0x93, 0x75, 0xea, 0xfc, 0xe5, 0x30, 0x73, 0x68, 0x1c, 0xa4, 0xdf, 0x8f, 0xef, 0x85,
-	0x2c, 0xf0, 0x03, 0xd2, 0x76, 0x5e, 0x18, 0xeb, 0x87, 0xb1, 0x91, 0x94, 0x58, 0x38, 0xac, 0x27,
-	0x1c, 0x36, 0x14, 0x0e, 0x09, 0x64, 0x9d, 0x1c, 0xd5, 0x9c, 0x0f, 0xd1, 0x57, 0x0a, 0x40, 0x7c,
-	0x41, 0x22, 0x71, 0xbe, 0x99, 0x4b, 0x5a, 0x17, 0x77, 0x74, 0xb5, 0xb2, 0x36, 0xe6, 0x86, 0x6a,
-	0xca, 0x3a, 0xfa, 0x19, 0x14, 0x3e, 0xa2, 0xf4, 0x59, 0xe4, 0xa3, 0x45, 0xde, 0xe8, 0xaa, 0xfa,
-	0x6d, 0x5b, 0x66, 0xfb, 0x69, 0x2c, 0xeb, 0xc2, 0xb2, 0x86, 0xbe, 0x35, 0x36, 0x37, 0xf8, 0x0c,
-	0x7f, 0x88, 0x7e, 0xa5, 0x40, 0xe1, 0x13, 0xdf, 0x3e, 0x65, 0xfe, 0x9e, 0x3b, 0xf6, 0xc2, 0x35,
-	0xf8, 0x1f, 0x57, 0x95, 0x1b, 0xc2, 0x8b, 0xb7, 0xcb, 0xaf, 0xe8, 0x05, 0xa7, 0xe1, 0x37, 0x0a,
-	0x14, 0xb6, 0x49, 0x8f, 0x30, 0x72, 0x9c, 0x87, 0x51, 0x66, 0x9e, 0x1c, 0xd5, 0xdf, 0x6e, 0x5e,
-	0x83, 0x05, 0x80, 0xba, 0xef, 0xdc, 0x21, 0xfd, 0x7a, 0xc4, 0xba, 0x68, 0x0a, 0xce, 0x43, 0xe1,
-	0x1e, 0xff, 0xac, 0xa2, 0x79, 0xc8, 0x07, 0xc4, 0xb2, 0x61, 0xfa, 0x79, 0xe0, 0x30, 0x12, 0x53,
-	0xb3, 0xfe, 0xaa, 0xd4, 0xfc, 0x4b, 0x81, 0x99, 0x5b, 0x84, 0x3d, 0x88, 0x48, 0xd0, 0xff, 0x7f,
-	0x92, 0xf3, 0xa5, 0x72, 0x54, 0x37, 0x2b, 0x3b, 0xb0, 0x7a, 0x52, 0x5f, 0x1d, 0x18, 0x9c, 0xb0,
-	0x9f, 0x3e, 0x56, 0x44, 0x74, 0x3a, 0xba, 0x3e, 0x2e, 0xba, 0x9f, 0x70, 0xf5, 0x49, 0x8c, 0x7f,
-	0x55, 0x21, 0xdf, 0x68, 0x75, 0x29, 0x7a, 0xe5, 0xa7, 0xb7, 0xfc, 0xca, 0xc8, 0xca, 0x7f, 0x94,
-	0xa3, 0xfa, 0x17, 0x0a, 0xcc, 0x91, 0x56, 0x97, 0xe2, 0x30, 0x6e, 0x98, 0x30, 0x23, 0x56, 0x81,
-	0xdf, 0x42, 0x4b, 0x0f, 0x23, 0xd7, 0xb5, 0x82, 0x7e, 0x0d, 0x37, 0xe4, 0x56, 0xb9, 0xb4, 0x4d,
-	0xc2, 0x56, 0xe0, 0x88, 0x3f, 0x7d, 0xc5, 0x6e, 0x65, 0x1b, 0x50, 0x96, 0x26, 0xe1, 0xed, 0x84,
-	0xe4, 0x08, 0x6a, 0x3e, 0x1b, 0x4f, 0x0d, 0x77, 0xcd, 0x38, 0x88, 0x7b, 0xca, 0xee, 0x85, 0x4a,
-	0xc9, 0xd8, 0xaf, 0x0e, 0xf0, 0xfc, 0xac, 0x16, 0x3f, 0x8e, 0xbb, 0x08, 0x1d, 0x3b, 0x42, 0x7f,
-	0x56, 0x61, 0x8e, 0xcf, 0x1f, 0xf7, 0x2d, 0xd6, 0x15, 0x3e, 0x7e, 0x33, 0x9d, 0xe6, 0x2f, 0xf1,
-	0xbd, 0x7f, 0xad, 0x54, 0xae, 0x8e, 0x89, 0xee, 0xbb, 0xdc, 0xcd, 0xdd, 0xf7, 0x2b, 0xef, 0x8e,
-	0x4d, 0xff, 0xcc, 0x0f, 0x09, 0x3a, 0x7f, 0x82, 0x79, 0x85, 0xee, 0x3e, 0xa9, 0x7c, 0x9a, 0x8e,
-	0x3a, 0x83, 0x32, 0x4e, 0x18, 0xea, 0x86, 0x15, 0x9d, 0x00, 0xd1, 0x63, 0xae, 0x79, 0xfd, 0xd7,
-	0x01, 0x76, 0xe8, 0xa6, 0xe3, 0xd9, 0x8e, 0xd7, 0x09, 0xd1, 0x85, 0x63, 0xb5, 0xb3, 0x2d, 0x7f,
-	0x98, 0x19, 0x59, 0x56, 0x53, 0xe8, 0x11, 0x9c, 0xe1, 0x03, 0x36, 0x8d, 0x18, 0x1a, 0x01, 0x1a,
-	0x29, 0x7c, 0x51, 0xb0, 0xf8, 0x06, 0x5a, 0x4e, 0x47, 0xc8, 0xa4, 0xb2, 0x2e, 0x94, 0x1a, 0x41,
-	0x40, 0x03, 0x3e, 0x7d, 0x6c, 0x13, 0x66, 0x39, 0xbd, 0x70, 0x62, 0x03, 0x57, 0x85, 0x81, 0xcb,
-	0x68, 0x35, 0x93, 0x38, 0x5c, 0xeb, 0x73, 0x87, 0x75, 0x6d, 0xa9, 0xf5, 0xd7, 0x0a, 0xa0, 0x5b,
-	0x84, 0x0d, 0x4f, 0x3b, 0xef, 0x8c, 0xcd, 0x8b, 0x21, 0x89, 0x91, 0x6e, 0x7c, 0x5b, 0xb8, 0x71,
-	0xa5, 0x72, 0x21, 0xed, 0x06, 0xf7, 0xa0, 0x49, 0xed, 0xbe, 0x71, 0xc0, 0x7b, 0xb1, 0x98, 0x8a,
-	0xd0, 0x17, 0x0a, 0x2c, 0xdd, 0xa7, 0x21, 0xe3, 0x1a, 0x85, 0xa8, 0x70, 0xe4, 0xd5, 0x06, 0xab,
-	0x91, 0xd6, 0x0d, 0x61, 0xfd, 0x1a, 0x4f, 0xd5, 0x97, 0xd6, 0x7d, 0x1a, 0x32, 0xee, 0x81, 0xf8,
-	0x59, 0x2e, 0x76, 0x23, 0x49, 0xb9, 0xf2, 0xd7, 0xca, 0x51, 0xfd, 0x4f, 0x0a, 0x6a, 0x8f, 0x98,
-	0xbe, 0xb0, 0x9d, 0x6a, 0x17, 0x1b, 0x1b, 0xf8, 0x79, 0xd7, 0x69, 0x75, 0x71, 0xd8, 0xa5, 0x51,
-	0xcf, 0xc6, 0x1e, 0x65, 0xb8, 0x49, 0x70, 0x14, 0x12, 0x1b, 0x3b, 0x1e, 0xf6, 0x7b, 0x56, 0x8b,
-	0x60, 0xda, 0xc6, 0xac, 0x4b, 0xb0, 0x4d, 0x5b, 0x91, 0x4b, 0xbc, 0xf8, 0x77, 0x35, 0xdc, 0xa2,
-	0x2e, 0x5f, 0x5c, 0x29, 0x3f, 0x80, 0xb5, 0x93, 0x7a, 0x32, 0x2f, 0xe7, 0x64, 0xde, 0x9b, 0xb0,
-	0xf3, 0x54, 0x9f, 0xc2, 0xd9, 0x96, 0xe5, 0x92, 0xde, 0x96, 0x15, 0x12, 0xa9, 0x83, 0x0f, 0x27,
-	0xc8, 0x84, 0x69, 0xc1, 0xc9, 0xc4, 0x89, 0x74, 0x41, 0x70, 0xb8, 0x8c, 0x96, 0x32, 0x89, 0xc4,
-	0x8f, 0xaa, 0x3f, 0x86, 0xd5, 0xba, 0x47, 0x59, 0x97, 0x04, 0xd2, 0x12, 0xbf, 0xbc, 0x54, 0x51,
-	0x7d, 0x3f, 0x53, 0x62, 0x93, 0x1a, 0x9e, 0xda, 0xfc, 0xe5, 0xf4, 0x51, 0xfd, 0xbf, 0x79, 0xc4,
-	0x60, 0xb9, 0x8e, 0x37, 0x1d, 0xc6, 0xc9, 0x4c, 0x75, 0xa2, 0xc7, 0x70, 0xb6, 0x63, 0xde, 0xdf,
-	0xda, 0xb8, 0x15, 0x47, 0x8e, 0xfd, 0x80, 0x3e, 0x25, 0x2d, 0x36, 0x29, 0x63, 0xe5, 0x92, 0x47,
-	0x3d, 0xf2, 0x43, 0x19, 0x19, 0x47, 0x57, 0x73, 0x37, 0xf4, 0x77, 0xd6, 0x73, 0x8a, 0x9a, 0xaf,
-	0x96, 0x2c, 0xdf, 0xef, 0x39, 0x2d, 0x71, 0x6d, 0xc6, 0xd3, 0x90, 0x7a, 0xd5, 0x73, 0xe9, 0x9d,
-	0x17, 0x1b, 0x6d, 0x4a, 0x37, 0x5c, 0xc7, 0x25, 0xb5, 0x63, 0xc8, 0xda, 0x08, 0xe4, 0xee, 0x97,
-	0x2a, 0x2c, 0x42, 0x71, 0xd3, 0x0a, 0x9d, 0x96, 0x98, 0x1f, 0xd4, 0x19, 0x05, 0x2e, 0x65, 0x26,
-	0x8a, 0xc5, 0x19, 0xb5, 0x5c, 0x7c, 0xbc, 0x51, 0xbf, 0x7f, 0x7b, 0xe3, 0x0e, 0xe9, 0x63, 0x15,
-	0xfe, 0xa9, 0x0c, 0x26, 0x8c, 0xbf, 0x29, 0x33, 0x39, 0x2d, 0x5f, 0x7d, 0x33, 0x09, 0x32, 0xe5,
-	0xb7, 0x41, 0xad, 0x88, 0x75, 0x0d, 0xfe, 0x0f, 0x0d, 0x9c, 0x9f, 0x92, 0xda, 0xda, 0x68, 0x10,
-	0xa3, 0xcf, 0x88, 0xb7, 0xf9, 0x0b, 0x28, 0xc7, 0x03, 0x0b, 0x42, 0xb7, 0x02, 0xcb, 0x63, 0x21,
-	0xe6, 0x0b, 0x6c, 0xb5, 0x5a, 0x24, 0x0c, 0x61, 0x55, 0x8e, 0x31, 0x68, 0x59, 0x1e, 0x8a, 0x55,
-	0x72, 0xba, 0x05, 0xd3, 0x96, 0xed, 0x3a, 0x1e, 0xaa, 0x65, 0x44, 0x3d, 0x3b, 0x03, 0xc3, 0x8c,
-	0x62, 0x01, 0x73, 0x42, 0xc6, 0xfb, 0xe9, 0x3e, 0xc1, 0x8e, 0xd7, 0xa6, 0x81, 0x2b, 0x68, 0x69,
-	0xae, 0xc1, 0x7c, 0x9a, 0x8a, 0xa9, 0xe1, 0xd1, 0xaa, 0x79, 0x6d, 0xe4, 0x70, 0x35, 0x0c, 0x0d,
-	0x6e, 0xc3, 0xf9, 0xbb, 0x2f, 0x6b, 0x28, 0x9d, 0x1a, 0x93, 0xa6, 0xc4, 0x6e, 0x71, 0xd0, 0x5f,
-	0x9a, 0x05, 0x91, 0x95, 0x37, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xa0, 0x3e, 0xc8, 0x49,
-	0x18, 0x00, 0x00,
+	// 2192 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x6c, 0x1b, 0xc7,
+	0x15, 0xd6, 0x92, 0x14, 0x2d, 0x3d, 0xfd, 0x51, 0x23, 0x5b, 0x96, 0x68, 0xd9, 0x1a, 0x33, 0x4e,
+	0xbb, 0x56, 0xac, 0xdd, 0x98, 0x0e, 0x0a, 0x87, 0x45, 0xda, 0x52, 0x12, 0x63, 0x1b, 0x8e, 0x65,
+	0x7b, 0xed, 0x38, 0x86, 0xea, 0x54, 0x58, 0x72, 0x87, 0xe4, 0xda, 0xdc, 0x9d, 0xcd, 0xee, 0xac,
+	0x2c, 0x56, 0x55, 0x8b, 0x36, 0x40, 0x8b, 0x9c, 0x0a, 0xa8, 0xf7, 0xa2, 0xe8, 0xad, 0x40, 0x2f,
+	0x45, 0x2f, 0x05, 0x72, 0x28, 0xd0, 0x4b, 0x0f, 0x3d, 0x16, 0xe8, 0xbd, 0x40, 0x4f, 0x3d, 0xf6,
+	0xdc, 0x43, 0x31, 0xb3, 0x43, 0x6a, 0x97, 0x3f, 0xa5, 0x69, 0x07, 0xb9, 0x48, 0x9c, 0x99, 0xef,
+	0x7d, 0xef, 0x6f, 0xde, 0x9b, 0x47, 0x42, 0x91, 0x1c, 0x9a, 0x8e, 0xd7, 0x22, 0x81, 0xee, 0xf9,
+	0x94, 0x51, 0x5d, 0x2e, 0xbd, 0xaa, 0x6e, 0xee, 0x57, 0x6d, 0xb6, 0x4f, 0xeb, 0xfb, 0xe4, 0x80,
+	0xf8, 0x6d, 0xd6, 0xb4, 0xdd, 0x86, 0x26, 0x30, 0x68, 0xbd, 0xe1, 0x7b, 0x35, 0xad, 0x61, 0x32,
+	0xf2, 0xd2, 0x6c, 0x6b, 0x1d, 0x02, 0xad, 0x2b, 0x9a, 0x5f, 0x6b, 0x50, 0xda, 0x68, 0x11, 0xdd,
+	0xf4, 0x6c, 0xdd, 0x74, 0x5d, 0xca, 0x4c, 0x66, 0x53, 0x37, 0x88, 0xc4, 0xf3, 0x17, 0xe4, 0xa9,
+	0x58, 0x55, 0xc3, 0xba, 0x4e, 0x1c, 0x8f, 0xb5, 0xe5, 0xe1, 0xa5, 0xde, 0x43, 0x2b, 0xf4, 0x85,
+	0xb4, 0x3c, 0xc7, 0x3d, 0xf6, 0x06, 0x61, 0x55, 0x77, 0x48, 0x10, 0x98, 0x0d, 0x22, 0x11, 0x97,
+	0xfb, 0x11, 0xc5, 0x1e, 0xc8, 0x7a, 0xaf, 0x12, 0x66, 0x3b, 0x24, 0x60, 0xa6, 0xe3, 0x49, 0xc0,
+	0x35, 0xf1, 0xaf, 0xb6, 0xd9, 0x20, 0xee, 0x66, 0xf0, 0xd2, 0x6c, 0x34, 0x88, 0xaf, 0x53, 0x4f,
+	0x38, 0xd1, 0xef, 0x50, 0xe1, 0xbf, 0x08, 0x72, 0xe5, 0x2d, 0x9b, 0xdd, 0xaf, 0x57, 0xba, 0xa1,
+	0x42, 0x9f, 0xc2, 0x5c, 0x60, 0xbb, 0x8d, 0x16, 0xd9, 0x77, 0x49, 0xc0, 0x88, 0xb5, 0xb2, 0x8a,
+	0x15, 0x75, 0xa6, 0x78, 0x53, 0x1b, 0x11, 0x3c, 0xad, 0x97, 0x49, 0xdb, 0x15, 0xf2, 0xc6, 0x6c,
+	0x44, 0x17, 0xad, 0x10, 0x82, 0x4c, 0x18, 0xda, 0xd6, 0x8a, 0x82, 0x15, 0x75, 0xda, 0x10, 0x9f,
+	0xd1, 0x03, 0xc8, 0x4a, 0x5d, 0x29, 0x9c, 0x7e, 0x23, 0x5d, 0x92, 0x07, 0xad, 0xc3, 0x4c, 0xbd,
+	0x45, 0x4d, 0xb6, 0x7f, 0x60, 0xb6, 0x42, 0xb2, 0x92, 0xc6, 0x8a, 0x9a, 0x32, 0x40, 0x6c, 0x3d,
+	0xe1, 0x3b, 0xe8, 0x32, 0xcc, 0x5a, 0x34, 0xac, 0xb6, 0x88, 0x44, 0x64, 0xb0, 0xa2, 0x2a, 0xc6,
+	0x4c, 0xb4, 0x17, 0x41, 0xd6, 0x61, 0xc6, 0x76, 0xd9, 0xb7, 0xde, 0x93, 0x88, 0x49, 0xac, 0xa8,
+	0x69, 0x03, 0xc4, 0x56, 0x97, 0x23, 0x8c, 0x23, 0xb2, 0x58, 0x51, 0x33, 0xc6, 0x4c, 0x18, 0x83,
+	0x44, 0x1c, 0x37, 0x8a, 0x12, 0x71, 0x06, 0x2b, 0xea, 0xa4, 0xe0, 0xb8, 0x51, 0x8c, 0x00, 0x6f,
+	0xc1, 0x5c, 0xdd, 0x3e, 0x24, 0x56, 0x97, 0x64, 0x0a, 0x2b, 0x6a, 0xd6, 0x98, 0x95, 0x9b, 0x49,
+	0x50, 0x97, 0x67, 0x1a, 0x2b, 0xea, 0x19, 0x09, 0xea, 0x30, 0x5d, 0x04, 0xa8, 0x52, 0xda, 0x92,
+	0x08, 0xc0, 0x8a, 0x3a, 0x65, 0x4c, 0xf3, 0x9d, 0xae, 0xb1, 0x01, 0xf3, 0x6d, 0xb7, 0x21, 0x01,
+	0x33, 0x22, 0xfe, 0x33, 0xd1, 0x5e, 0xd7, 0xd8, 0x6a, 0x9b, 0x91, 0x40, 0x22, 0x2e, 0x62, 0x45,
+	0x9d, 0x35, 0x40, 0x6c, 0x25, 0x1c, 0xee, 0x9a, 0x31, 0x87, 0x15, 0x75, 0x2e, 0x72, 0xb8, 0x63,
+	0xc5, 0x5d, 0x00, 0xe2, 0x86, 0x8e, 0x04, 0xcc, 0x63, 0x45, 0x9d, 0x2f, 0x5e, 0x1b, 0x99, 0xce,
+	0xdd, 0xd0, 0x21, 0xbe, 0x5d, 0xab, 0xb8, 0xa1, 0x63, 0x4c, 0x73, 0xf9, 0x88, 0xec, 0x6d, 0x98,
+	0x0f, 0x92, 0x8e, 0x2f, 0x60, 0x45, 0x5d, 0x30, 0xe6, 0x82, 0x84, 0xe7, 0x5d, 0x58, 0x37, 0x88,
+	0x39, 0xac, 0xa8, 0xb9, 0x0e, 0x2c, 0x96, 0xae, 0x20, 0x6e, 0xfd, 0x22, 0x56, 0xd4, 0x45, 0x63,
+	0x26, 0x88, 0x59, 0x2f, 0x21, 0x5d, 0x1e, 0x84, 0x15, 0x15, 0x45, 0x90, 0x0e, 0x4b, 0x11, 0xce,
+	0xf9, 0xc4, 0x23, 0x26, 0x23, 0xd6, 0x7e, 0x22, 0xa0, 0x4b, 0x38, 0xad, 0x4e, 0x1b, 0x4b, 0x9d,
+	0xc3, 0x47, 0xb1, 0xc0, 0x6a, 0x80, 0xa8, 0x4b, 0x68, 0x3d, 0x42, 0x4a, 0xb1, 0x95, 0x73, 0x3c,
+	0x03, 0xb7, 0x27, 0x8c, 0x9c, 0x38, 0x13, 0xc8, 0x48, 0x08, 0x35, 0x93, 0x78, 0x59, 0x1b, 0x97,
+	0xde, 0xac, 0x0e, 0x93, 0x9a, 0x64, 0x35, 0x3e, 0x83, 0x69, 0xc7, 0xf4, 0xa4, 0x07, 0xcb, 0xa2,
+	0xf8, 0xbe, 0x3b, 0xbe, 0x82, 0x7b, 0xa6, 0x27, 0x48, 0x2b, 0x2e, 0xf3, 0xdb, 0xc6, 0x94, 0x23,
+	0x97, 0xe8, 0x10, 0x96, 0x1c, 0xd3, 0xf3, 0x7a, 0x23, 0x75, 0x5e, 0xe8, 0xb9, 0xfd, 0x5a, 0x7a,
+	0xbc, 0x44, 0x64, 0x23, 0x85, 0x8b, 0x4e, 0xef, 0x7e, 0x4c, 0x73, 0x14, 0x3c, 0xa9, 0x79, 0xe5,
+	0xcd, 0x34, 0x47, 0x41, 0xeb, 0xd7, 0x1c, 0xdb, 0x47, 0x25, 0x58, 0x71, 0xa9, 0xbb, 0x4d, 0xdd,
+	0x03, 0xe2, 0xf2, 0x5e, 0x6b, 0xb6, 0x76, 0x4d, 0x27, 0xea, 0x28, 0x2b, 0x79, 0x51, 0x73, 0x43,
+	0xcf, 0xd1, 0x36, 0x2c, 0x74, 0x1b, 0xba, 0xb4, 0xf8, 0x82, 0x48, 0x7a, 0x5e, 0x8b, 0x1a, 0xbf,
+	0xd6, 0x69, 0xfc, 0xda, 0xe3, 0x0e, 0xce, 0x98, 0xef, 0x8a, 0x44, 0x24, 0xcf, 0xa0, 0x7b, 0x07,
+	0xf7, 0x63, 0xa5, 0xb8, 0x86, 0xd3, 0x63, 0x97, 0xe2, 0x62, 0x87, 0xa8, 0xd2, 0x29, 0xc9, 0xfc,
+	0xef, 0xd3, 0x90, 0x3d, 0xed, 0xe4, 0xae, 0xe9, 0x90, 0x4e, 0x27, 0xe7, 0x9f, 0xd1, 0x32, 0x64,
+	0x4d, 0x87, 0x86, 0x2e, 0x5b, 0x49, 0x89, 0xde, 0x20, 0x57, 0xe8, 0x21, 0xa4, 0xe8, 0x0b, 0xd1,
+	0x86, 0xe7, 0x8b, 0xe5, 0xd7, 0xbd, 0xc1, 0xda, 0x0e, 0x21, 0x9e, 0x30, 0x2c, 0x45, 0x5f, 0xa0,
+	0xa7, 0xb0, 0x64, 0x11, 0xe2, 0x11, 0x3f, 0x99, 0xe2, 0x8c, 0x08, 0x98, 0x3a, 0x44, 0x47, 0x10,
+	0x56, 0xb5, 0xe8, 0x9e, 0xdc, 0x8b, 0x1e, 0x56, 0x63, 0x31, 0x22, 0x89, 0xa7, 0x90, 0xc0, 0x6a,
+	0xbc, 0xfc, 0x12, 0x5a, 0x44, 0x07, 0x1a, 0x83, 0xff, 0xf6, 0x84, 0xb1, 0x7c, 0x5a, 0x75, 0x3b,
+	0x31, 0x5d, 0xa8, 0x08, 0x67, 0xe3, 0x6a, 0x18, 0xf1, 0x1d, 0xdb, 0x35, 0x5b, 0xa2, 0x79, 0xf1,
+	0xbe, 0x80, 0x4e, 0xe5, 0x1e, 0xcb, 0xb3, 0xc2, 0x3a, 0x4c, 0x75, 0x82, 0x80, 0xa6, 0x61, 0xf2,
+	0xc3, 0xf2, 0x47, 0x8f, 0x2a, 0xb9, 0x09, 0x34, 0x05, 0x99, 0xc7, 0xc6, 0xc7, 0x95, 0x9c, 0xb2,
+	0x35, 0x07, 0x33, 0x31, 0xd2, 0xbc, 0x0d, 0x73, 0x89, 0xe2, 0x44, 0x39, 0x48, 0xbf, 0x20, 0x6d,
+	0x99, 0x33, 0xfe, 0x11, 0x6d, 0xc1, 0x64, 0x14, 0xb9, 0xd4, 0x6b, 0x34, 0xeb, 0x48, 0xb4, 0x94,
+	0xba, 0xa9, 0xe4, 0x77, 0x60, 0x79, 0x70, 0x7d, 0x0e, 0xd0, 0x79, 0x36, 0xae, 0x73, 0x3a, 0xce,
+	0xf2, 0xe3, 0x0e, 0x4b, 0x6f, 0xad, 0x0d, 0x60, 0xd9, 0x8d, 0xb3, 0xbc, 0xc9, 0xd4, 0x70, 0xaa,
+	0xbf, 0xf4, 0xfd, 0x93, 0xf2, 0xd3, 0x8d, 0x27, 0x70, 0xe5, 0x43, 0xdb, 0xb5, 0x30, 0x0d, 0x19,
+	0x76, 0xa8, 0x4f, 0xb0, 0x59, 0xe5, 0x1f, 0xfb, 0x46, 0x25, 0xad, 0xc9, 0x98, 0x17, 0x94, 0x74,
+	0xbd, 0x61, 0xb3, 0x66, 0x58, 0xd5, 0x6a, 0xd4, 0xd1, 0xb9, 0x0d, 0x9b, 0xa4, 0x46, 0x83, 0x76,
+	0xc0, 0x88, 0x5c, 0x4a, 0x93, 0x7a, 0x92, 0x53, 0xc8, 0x43, 0x66, 0x8b, 0x5a, 0xed, 0x41, 0x85,
+	0x54, 0x78, 0x06, 0x0b, 0xf2, 0x06, 0x7d, 0x62, 0xb3, 0xa6, 0x80, 0xcd, 0x43, 0xaa, 0x3b, 0x37,
+	0xa5, 0x6c, 0x0b, 0xbd, 0x0f, 0x19, 0xcb, 0x64, 0xa6, 0xf4, 0xfe, 0xed, 0x91, 0xde, 0x73, 0x12,
+	0x43, 0x88, 0x6c, 0x60, 0x98, 0x89, 0x65, 0x91, 0x5f, 0x9f, 0xbd, 0x8a, 0x71, 0x3f, 0x37, 0x81,
+	0xce, 0x40, 0xfa, 0xfe, 0x6e, 0x25, 0xa7, 0x14, 0xff, 0xb0, 0x02, 0xe7, 0x7b, 0xfd, 0x7d, 0x44,
+	0xfc, 0x03, 0xbb, 0x46, 0xd0, 0x1f, 0xd3, 0x90, 0xdd, 0xf6, 0x79, 0x63, 0x40, 0xd7, 0xc7, 0x8e,
+	0x79, 0x7e, 0x7c, 0x91, 0xc2, 0x5f, 0x52, 0x3f, 0xfb, 0xfb, 0xbf, 0x7e, 0x95, 0xfa, 0x32, 0x55,
+	0xf8, 0x53, 0x4a, 0x3f, 0xb8, 0xde, 0x99, 0xf5, 0x07, 0x4d, 0xfa, 0xfa, 0x51, 0x6c, 0xee, 0x3b,
+	0xd6, 0x8f, 0xe2, 0x43, 0xde, 0xb1, 0x7e, 0x14, 0x7b, 0xdc, 0x8f, 0xf5, 0x80, 0x78, 0xa6, 0x6f,
+	0x32, 0xea, 0xeb, 0x47, 0x61, 0xe2, 0xe0, 0x28, 0x36, 0x26, 0x1c, 0xeb, 0x47, 0x89, 0xd9, 0xa2,
+	0xb3, 0x8e, 0x9d, 0x9f, 0x8e, 0x5d, 0xc7, 0xfa, 0x51, 0xfc, 0xa5, 0xfb, 0x20, 0x60, 0xbe, 0xe7,
+	0x93, 0xba, 0x7d, 0xa8, 0x6f, 0x1c, 0x47, 0x4a, 0x62, 0x62, 0x41, 0x2f, 0x4f, 0xd0, 0xab, 0x28,
+	0xe8, 0x11, 0x48, 0x1a, 0xd9, 0x3f, 0x52, 0x1c, 0xeb, 0x47, 0xc3, 0xde, 0x96, 0x63, 0xf4, 0x6b,
+	0x05, 0x20, 0xca, 0x9a, 0xb8, 0x4d, 0x5f, 0x4f, 0xe6, 0x36, 0x44, 0xe2, 0xae, 0x14, 0xd6, 0x47,
+	0xa4, 0xad, 0xa4, 0x6c, 0xa0, 0x1f, 0x41, 0xf6, 0x23, 0x4a, 0x5f, 0x84, 0x1e, 0x5a, 0xe0, 0x7d,
+	0xb4, 0xa8, 0xdd, 0xb1, 0x64, 0x09, 0xbc, 0x8e, 0x66, 0x4d, 0x68, 0x56, 0xd1, 0x37, 0x46, 0x5e,
+	0x18, 0xfe, 0x15, 0xe4, 0x18, 0xfd, 0x5c, 0x81, 0xec, 0xc7, 0x9e, 0xf5, 0x9a, 0x97, 0x7a, 0xb9,
+	0xef, 0x81, 0xae, 0xf0, 0xef, 0x86, 0x85, 0xeb, 0xc2, 0x8a, 0x77, 0xf2, 0xaf, 0x68, 0x05, 0x0f,
+	0xc3, 0x2f, 0x15, 0xc8, 0xee, 0x90, 0x16, 0x61, 0xa4, 0x3f, 0x0e, 0xc3, 0xd4, 0x3c, 0x3b, 0x29,
+	0xbf, 0x53, 0xbd, 0x0a, 0xf3, 0x00, 0x65, 0xcf, 0xbe, 0x4b, 0xda, 0xe5, 0x90, 0x35, 0xd1, 0x04,
+	0x9c, 0x87, 0xec, 0x7d, 0xfe, 0xb1, 0x88, 0xe6, 0x20, 0xe3, 0x13, 0xd3, 0x82, 0xc9, 0x97, 0xbe,
+	0xcd, 0x48, 0x14, 0x9a, 0x8d, 0x57, 0x0d, 0xcd, 0x3f, 0x15, 0x98, 0xba, 0x45, 0xd8, 0xc3, 0x90,
+	0xf8, 0xed, 0xaf, 0x32, 0x38, 0x5f, 0x28, 0x27, 0x65, 0xa3, 0xb0, 0x0b, 0x6b, 0x83, 0x9a, 0x6d,
+	0x57, 0xe1, 0x98, 0x4d, 0xf6, 0xa9, 0x22, 0xbc, 0xd3, 0xd0, 0xb5, 0x51, 0xde, 0x7d, 0xc6, 0xe9,
+	0x3b, 0x3e, 0xfe, 0x35, 0x05, 0x99, 0x4a, 0xad, 0x49, 0xd1, 0x2b, 0xbf, 0xec, 0xf9, 0x57, 0x46,
+	0x16, 0xfe, 0xad, 0x9c, 0x94, 0x3f, 0x57, 0x60, 0x96, 0xd4, 0x9a, 0x14, 0x07, 0x51, 0x17, 0x85,
+	0x29, 0xb1, 0xf2, 0xbd, 0x1a, 0x5a, 0x7c, 0x14, 0x3a, 0x8e, 0xe9, 0xb7, 0x4b, 0xb8, 0x22, 0xb7,
+	0xf2, 0xb9, 0x1d, 0x12, 0xd4, 0x7c, 0x5b, 0x7c, 0x73, 0x17, 0xbb, 0x85, 0x1d, 0x40, 0xc9, 0x30,
+	0x09, 0x6b, 0xc7, 0x0c, 0x8e, 0x08, 0xcd, 0xa7, 0xa3, 0x43, 0xc3, 0x4d, 0xd3, 0x8f, 0xa2, 0x46,
+	0xb3, 0xb7, 0x5a, 0xc8, 0xe9, 0x07, 0xc5, 0x2e, 0x9e, 0x9f, 0x95, 0xa2, 0x17, 0x73, 0x0f, 0xa1,
+	0xbe, 0x23, 0xf4, 0x9b, 0x2c, 0xcc, 0xf2, 0x19, 0xe5, 0x81, 0xc9, 0x9a, 0xc2, 0xc6, 0xaf, 0xa7,
+	0xd3, 0xfc, 0x6e, 0x52, 0x38, 0xf7, 0xdb, 0xc9, 0xc2, 0x95, 0x11, 0xde, 0x7d, 0x9b, 0x9b, 0xb9,
+	0xf7, 0x7e, 0xe1, 0xbd, 0x91, 0xd7, 0x3f, 0xf1, 0x3b, 0x88, 0xc6, 0xdf, 0x65, 0x5e, 0xa1, 0x7b,
+	0xcf, 0x0a, 0x9f, 0xc4, 0xbd, 0x4e, 0xa0, 0xf4, 0x01, 0x33, 0x69, 0x2f, 0xd1, 0x00, 0x88, 0x16,
+	0xc5, 0x9a, 0xb3, 0x7f, 0x50, 0xb8, 0x19, 0x67, 0xef, 0xef, 0xf2, 0x32, 0x3b, 0x03, 0xda, 0x3f,
+	0x17, 0xbf, 0x55, 0xd8, 0x1a, 0x26, 0x2e, 0x2d, 0xe4, 0x7e, 0x0c, 0xe0, 0xe8, 0xf5, 0xf2, 0xb3,
+	0x42, 0x6b, 0x04, 0xd1, 0x20, 0x57, 0xa3, 0xbf, 0x43, 0xd9, 0xff, 0xbf, 0xeb, 0x8d, 0x42, 0x75,
+	0x84, 0xca, 0x41, 0x03, 0xf3, 0x70, 0x6d, 0x83, 0xd0, 0x42, 0xd1, 0x71, 0xe1, 0x70, 0x0c, 0x45,
+	0x09, 0xa3, 0x47, 0x79, 0x38, 0x54, 0xf0, 0xd4, 0x4f, 0x54, 0x06, 0xd8, 0xa5, 0x5b, 0xb6, 0x6b,
+	0xd9, 0x6e, 0x23, 0x40, 0xab, 0x7d, 0xed, 0x71, 0x47, 0xfe, 0x74, 0x38, 0xb4, 0x73, 0x4e, 0xa0,
+	0x27, 0x70, 0x86, 0x7f, 0x05, 0xa4, 0x21, 0x43, 0x43, 0x40, 0x43, 0x85, 0x2f, 0x88, 0x42, 0x39,
+	0x87, 0x96, 0xe2, 0x21, 0x60, 0x92, 0xac, 0x09, 0xb9, 0x8a, 0xef, 0x53, 0x9f, 0x4f, 0x9d, 0x3b,
+	0x84, 0x99, 0x76, 0x2b, 0x18, 0x5b, 0xc1, 0x15, 0xa1, 0xe0, 0x12, 0x5a, 0x4b, 0xf4, 0x06, 0xce,
+	0xfa, 0xd2, 0x66, 0x4d, 0x4b, 0xb2, 0xfe, 0x42, 0x01, 0x74, 0x8b, 0xb0, 0xde, 0x29, 0xf7, 0xdd,
+	0x91, 0xa5, 0xdf, 0x23, 0x31, 0xd4, 0x8c, 0x6f, 0x0a, 0x33, 0x2e, 0x17, 0x56, 0xe3, 0x66, 0x70,
+	0x0b, 0xaa, 0xd4, 0x6a, 0xeb, 0x47, 0xfc, 0xb9, 0x15, 0xd3, 0x30, 0xfa, 0x5c, 0x81, 0xc5, 0x07,
+	0x34, 0x60, 0x9c, 0x51, 0x88, 0x0a, 0x43, 0x5e, 0x6d, 0xa0, 0x1e, 0xaa, 0x5d, 0x17, 0xda, 0xaf,
+	0xf2, 0x6e, 0x74, 0xaa, 0xdd, 0xa3, 0x01, 0xe3, 0x16, 0x88, 0x1f, 0x8e, 0x23, 0x33, 0x3a, 0xf5,
+	0x96, 0xff, 0xb3, 0x72, 0x52, 0xfe, 0x52, 0x41, 0xf5, 0x21, 0x53, 0x37, 0xb6, 0x62, 0x2f, 0xc2,
+	0xe6, 0x26, 0x7e, 0xd9, 0xb4, 0x6b, 0x4d, 0x1c, 0x34, 0x69, 0xd8, 0xb2, 0xb0, 0x4b, 0x19, 0xae,
+	0x12, 0x1c, 0x06, 0xc4, 0xc2, 0xb6, 0x8b, 0xbd, 0x96, 0x59, 0x23, 0x98, 0xd6, 0x31, 0x6b, 0x12,
+	0x6c, 0xd1, 0x5a, 0xe8, 0x10, 0x37, 0xfa, 0xe5, 0x17, 0xd7, 0xa8, 0xc3, 0x17, 0x97, 0xf3, 0x0f,
+	0x61, 0x7d, 0xd0, 0xb3, 0xcb, 0x3b, 0x76, 0x67, 0xce, 0x1f, 0xf3, 0x71, 0x29, 0x3e, 0x87, 0xb3,
+	0x35, 0xd3, 0x21, 0xad, 0x6d, 0x33, 0x20, 0x92, 0x83, 0xcf, 0x9f, 0xc8, 0x80, 0x49, 0x11, 0x93,
+	0xb1, 0x2f, 0xd2, 0xaa, 0x88, 0xe1, 0x12, 0x5a, 0x4c, 0x5c, 0x24, 0x7e, 0x54, 0xfc, 0x01, 0xac,
+	0x95, 0x5d, 0xca, 0x9a, 0xc4, 0x97, 0x9a, 0x78, 0xf2, 0x62, 0x45, 0xf5, 0x9d, 0x44, 0x89, 0x8d,
+	0xab, 0x78, 0x62, 0xeb, 0xa7, 0x93, 0x27, 0xe5, 0xff, 0x64, 0x10, 0x83, 0xa5, 0x32, 0xde, 0xb2,
+	0x19, 0x0f, 0x66, 0xec, 0xb1, 0x79, 0x0a, 0x67, 0x1b, 0xc6, 0x83, 0xed, 0xcd, 0x5b, 0x91, 0xe7,
+	0xd8, 0xf3, 0xe9, 0x73, 0x52, 0x63, 0xe3, 0x46, 0x2c, 0x9f, 0x73, 0xa9, 0x4b, 0xbe, 0x27, 0x3d,
+	0xe3, 0xe8, 0x62, 0xfa, 0xba, 0xf6, 0xee, 0x46, 0x5a, 0x49, 0x65, 0x8a, 0x39, 0xd3, 0xf3, 0x5a,
+	0x76, 0x4d, 0xa4, 0x4d, 0x7f, 0x1e, 0x50, 0xb7, 0xb8, 0x1c, 0xdf, 0x39, 0xdc, 0xac, 0x53, 0xba,
+	0xe9, 0xd8, 0x0e, 0x29, 0xf5, 0x21, 0x4b, 0x43, 0x90, 0x7b, 0x5f, 0xa4, 0x60, 0x01, 0xa6, 0xb7,
+	0xcc, 0xc0, 0xae, 0x89, 0x11, 0x31, 0x35, 0xa5, 0xc0, 0xc5, 0xc4, 0xd0, 0xb8, 0x30, 0x95, 0xca,
+	0x4f, 0x3f, 0xdd, 0x2c, 0x3f, 0xb8, 0xb3, 0x79, 0x97, 0xb4, 0x71, 0x0a, 0xfe, 0xa1, 0x74, 0x87,
+	0xc8, 0xbf, 0x29, 0x53, 0x69, 0x35, 0x53, 0x7c, 0xab, 0xe3, 0x64, 0xcc, 0x6e, 0x9d, 0x9a, 0x21,
+	0x6b, 0xea, 0xfc, 0x0f, 0xf5, 0xed, 0x1f, 0x92, 0xd2, 0xfa, 0x70, 0x10, 0xa3, 0x2f, 0x88, 0xbb,
+	0xf5, 0x13, 0xc8, 0x47, 0x33, 0x29, 0x42, 0xb7, 0x7c, 0xd3, 0x65, 0x01, 0xe6, 0x0b, 0x6c, 0xd6,
+	0x6a, 0x24, 0x08, 0x60, 0x4d, 0x4e, 0xaa, 0x68, 0x49, 0x1e, 0x8a, 0x55, 0xe7, 0x74, 0x1b, 0x26,
+	0x4d, 0xcb, 0xb1, 0x5d, 0x54, 0x4a, 0x88, 0xba, 0x56, 0x02, 0x86, 0x19, 0xc5, 0x02, 0x66, 0x07,
+	0x8c, 0xf7, 0xd3, 0x03, 0x82, 0x6d, 0xb7, 0x4e, 0x7d, 0x47, 0x84, 0xa5, 0xba, 0x0e, 0x73, 0xf1,
+	0x50, 0x4c, 0xf4, 0x4e, 0xcf, 0xd5, 0xab, 0x43, 0xe7, 0xe7, 0x5e, 0xa8, 0x7f, 0x07, 0xce, 0xdf,
+	0x3b, 0xad, 0xa1, 0xf8, 0xd5, 0x18, 0xf7, 0x4a, 0xec, 0x4d, 0x77, 0xfb, 0x4b, 0x35, 0x2b, 0x6e,
+	0xe5, 0x8d, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x35, 0x42, 0x75, 0x40, 0xeb, 0x1a, 0x00, 0x00,
 }
diff --git a/examples/proto/examplepb/a_bit_of_everything.pb.gw.go b/examples/proto/examplepb/a_bit_of_everything.pb.gw.go
index 73a7a92a817..126bbbe39db 100644
--- a/examples/proto/examplepb/a_bit_of_everything.pb.gw.go
+++ b/examples/proto/examplepb/a_bit_of_everything.pb.gw.go
@@ -32,7 +32,7 @@ var _ = runtime.String
 var _ = utilities.NewDoubleArray
 
 var (
-	filter_ABitOfEverythingService_Create_0 = &utilities.DoubleArray{Encoding: map[string]int{"float_value": 0, "double_value": 1, "int64_value": 2, "uint64_value": 3, "int32_value": 4, "fixed64_value": 5, "fixed32_value": 6, "bool_value": 7, "string_value": 8, "uint32_value": 9, "sfixed32_value": 10, "sfixed64_value": 11, "sint32_value": 12, "sint64_value": 13, "nonConventionalNameValue": 14}, Base: []int{1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, Check: []int{0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}}
+	filter_ABitOfEverythingService_Create_0 = &utilities.DoubleArray{Encoding: map[string]int{"float_value": 0, "double_value": 1, "int64_value": 2, "uint64_value": 3, "int32_value": 4, "fixed64_value": 5, "fixed32_value": 6, "bool_value": 7, "string_value": 8, "uint32_value": 9, "sfixed32_value": 10, "sfixed64_value": 11, "sint32_value": 12, "sint64_value": 13, "oneof_value_string": 14, "nonConventionalNameValue": 15}, Base: []int{1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, Check: []int{0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}}
 )
 
 func request_ABitOfEverythingService_Create_0(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -200,6 +200,22 @@ func request_ABitOfEverythingService_Create_0(ctx context.Context, marshaler run
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "sint64_value", err)
 	}
 
+	val, ok = pathParams["oneof_value_string"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "oneof_value_string")
+	}
+
+	if protoReq.OneofValue == nil {
+		protoReq.OneofValue = &ABitOfEverything_OneofValueString{}
+	} else if _, ok := protoReq.OneofValue.(*ABitOfEverything_OneofValueString); !ok {
+		return nil, metadata, grpc.Errorf(codes.InvalidArgument, "expect type: *ABitOfEverything_OneofValueString, but: %t\n", protoReq.OneofValue)
+	}
+	protoReq.OneofValue.(*ABitOfEverything_OneofValueString).OneofValueString, err = runtime.String(val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "oneof_value_string", err)
+	}
+
 	val, ok = pathParams["nonConventionalNameValue"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "nonConventionalNameValue")
@@ -489,6 +505,166 @@ func request_ABitOfEverythingService_DeepPathEcho_2(ctx context.Context, marshal
 
 }
 
+func request_ABitOfEverythingService_DeepPathEcho_3(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq ABitOfEverything
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	var (
+		val string
+		ok  bool
+		err error
+		_   = err
+	)
+
+	val, ok = pathParams["oneof_value_string"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "oneof_value_string")
+	}
+
+	if protoReq.OneofValue == nil {
+		protoReq.OneofValue = &ABitOfEverything_OneofValueString{}
+	} else if _, ok := protoReq.OneofValue.(*ABitOfEverything_OneofValueString); !ok {
+		return nil, metadata, grpc.Errorf(codes.InvalidArgument, "expect type: *ABitOfEverything_OneofValueString, but: %t\n", protoReq.OneofValue)
+	}
+	protoReq.OneofValue.(*ABitOfEverything_OneofValueString).OneofValueString, err = runtime.String(val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "oneof_value_string", err)
+	}
+
+	msg, err := client.DeepPathEcho(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func request_ABitOfEverythingService_DeepPathEcho_4(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq ABitOfEverything
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	var (
+		val string
+		ok  bool
+		err error
+		_   = err
+	)
+
+	val, ok = pathParams["oneof_value_nested.name"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "oneof_value_nested.name")
+	}
+
+	err = runtime.PopulateFieldFromPath(&protoReq, "oneof_value_nested.name", val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "oneof_value_nested.name", err)
+	}
+
+	msg, err := client.DeepPathEcho(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func request_ABitOfEverythingService_DeepPathEcho_5(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq ABitOfEverything
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	var (
+		val string
+		ok  bool
+		err error
+		_   = err
+	)
+
+	val, ok = pathParams["oneof_value_nested.deeper_nested_value.value"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "oneof_value_nested.deeper_nested_value.value")
+	}
+
+	err = runtime.PopulateFieldFromPath(&protoReq, "oneof_value_nested.deeper_nested_value.value", val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "oneof_value_nested.deeper_nested_value.value", err)
+	}
+
+	msg, err := client.DeepPathEcho(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func request_ABitOfEverythingService_DeepPathEcho_6(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq ABitOfEverything
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	var (
+		val string
+		ok  bool
+		err error
+		_   = err
+	)
+
+	val, ok = pathParams["oneof_value_nested.oneof_value_terminal"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "oneof_value_nested.oneof_value_terminal")
+	}
+
+	err = runtime.PopulateFieldFromPath(&protoReq, "oneof_value_nested.oneof_value_terminal", val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "oneof_value_nested.oneof_value_terminal", err)
+	}
+
+	msg, err := client.DeepPathEcho(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func request_ABitOfEverythingService_DeepPathEcho_7(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq ABitOfEverything
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	var (
+		val string
+		ok  bool
+		err error
+		_   = err
+	)
+
+	val, ok = pathParams["oneof_value_nested.oneof_value_deeper_nested.value"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "oneof_value_nested.oneof_value_deeper_nested.value")
+	}
+
+	err = runtime.PopulateFieldFromPath(&protoReq, "oneof_value_nested.oneof_value_deeper_nested.value", val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "oneof_value_nested.oneof_value_deeper_nested.value", err)
+	}
+
+	msg, err := client.DeepPathEcho(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
 func request_ABitOfEverythingService_Timeout_0(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq empty.Empty
 	var metadata runtime.ServerMetadata
@@ -964,6 +1140,151 @@ func RegisterABitOfEverythingServiceHandlerClient(ctx context.Context, mux *runt
 
 	})
 
+	mux.Handle("POST", pattern_ABitOfEverythingService_DeepPathEcho_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		if cn, ok := w.(http.CloseNotifier); ok {
+			go func(done <-chan struct{}, closed <-chan bool) {
+				select {
+				case <-done:
+				case <-closed:
+					cancel()
+				}
+			}(ctx.Done(), cn.CloseNotify())
+		}
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ABitOfEverythingService_DeepPathEcho_3(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ABitOfEverythingService_DeepPathEcho_3(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	mux.Handle("POST", pattern_ABitOfEverythingService_DeepPathEcho_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		if cn, ok := w.(http.CloseNotifier); ok {
+			go func(done <-chan struct{}, closed <-chan bool) {
+				select {
+				case <-done:
+				case <-closed:
+					cancel()
+				}
+			}(ctx.Done(), cn.CloseNotify())
+		}
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ABitOfEverythingService_DeepPathEcho_4(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ABitOfEverythingService_DeepPathEcho_4(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	mux.Handle("POST", pattern_ABitOfEverythingService_DeepPathEcho_5, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		if cn, ok := w.(http.CloseNotifier); ok {
+			go func(done <-chan struct{}, closed <-chan bool) {
+				select {
+				case <-done:
+				case <-closed:
+					cancel()
+				}
+			}(ctx.Done(), cn.CloseNotify())
+		}
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ABitOfEverythingService_DeepPathEcho_5(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ABitOfEverythingService_DeepPathEcho_5(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	mux.Handle("POST", pattern_ABitOfEverythingService_DeepPathEcho_6, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		if cn, ok := w.(http.CloseNotifier); ok {
+			go func(done <-chan struct{}, closed <-chan bool) {
+				select {
+				case <-done:
+				case <-closed:
+					cancel()
+				}
+			}(ctx.Done(), cn.CloseNotify())
+		}
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ABitOfEverythingService_DeepPathEcho_6(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ABitOfEverythingService_DeepPathEcho_6(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	mux.Handle("POST", pattern_ABitOfEverythingService_DeepPathEcho_7, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		if cn, ok := w.(http.CloseNotifier); ok {
+			go func(done <-chan struct{}, closed <-chan bool) {
+				select {
+				case <-done:
+				case <-closed:
+					cancel()
+				}
+			}(ctx.Done(), cn.CloseNotify())
+		}
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ABitOfEverythingService_DeepPathEcho_7(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ABitOfEverythingService_DeepPathEcho_7(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	mux.Handle("GET", pattern_ABitOfEverythingService_Timeout_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -1084,7 +1405,7 @@ func RegisterABitOfEverythingServiceHandlerClient(ctx context.Context, mux *runt
 }
 
 var (
-	pattern_ABitOfEverythingService_Create_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 2, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 2, 12, 1, 0, 4, 2, 5, 13, 1, 0, 4, 1, 5, 14, 1, 0, 4, 1, 5, 15, 1, 0, 4, 1, 5, 16, 1, 0, 4, 1, 5, 17, 1, 0, 4, 1, 5, 18, 1, 0, 4, 1, 5, 19}, []string{"v1", "example", "a_bit_of_everything", "float_value", "double_value", "int64_value", "separator", "uint64_value", "int32_value", "fixed64_value", "fixed32_value", "bool_value", "strprefix", "string_value", "uint32_value", "sfixed32_value", "sfixed64_value", "sint32_value", "sint64_value", "nonConventionalNameValue"}, ""))
+	pattern_ABitOfEverythingService_Create_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5, 2, 6, 1, 0, 4, 1, 5, 7, 1, 0, 4, 1, 5, 8, 1, 0, 4, 1, 5, 9, 1, 0, 4, 1, 5, 10, 1, 0, 4, 1, 5, 11, 2, 12, 1, 0, 4, 2, 5, 13, 1, 0, 4, 1, 5, 14, 1, 0, 4, 1, 5, 15, 1, 0, 4, 1, 5, 16, 1, 0, 4, 1, 5, 17, 1, 0, 4, 1, 5, 18, 1, 0, 4, 1, 5, 19, 1, 0, 4, 1, 5, 20}, []string{"v1", "example", "a_bit_of_everything", "float_value", "double_value", "int64_value", "separator", "uint64_value", "int32_value", "fixed64_value", "fixed32_value", "bool_value", "strprefix", "string_value", "uint32_value", "sfixed32_value", "sfixed64_value", "sint32_value", "sint64_value", "oneof_value_string", "nonConventionalNameValue"}, ""))
 
 	pattern_ABitOfEverythingService_CreateBody_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "example", "a_bit_of_everything"}, ""))
 
@@ -1108,6 +1429,16 @@ var (
 
 	pattern_ABitOfEverythingService_DeepPathEcho_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"v2", "example", "single_nested", "deeper_nested_value", "single_nested.deeper_nested_value.value"}, ""))
 
+	pattern_ABitOfEverythingService_DeepPathEcho_3 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 2}, []string{"v2", "example", "oneof_value_string", "echo"}, ""))
+
+	pattern_ABitOfEverythingService_DeepPathEcho_4 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"v2", "example", "oneof_value_nested", "name", "echo", "oneof_value_nested.name"}, ""))
+
+	pattern_ABitOfEverythingService_DeepPathEcho_5 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5, 1, 0, 4, 1, 5, 6}, []string{"v2", "example", "oneof_value_nested", "deeper_nested_value", "value", "echo", "oneof_value_nested.deeper_nested_value.value"}, ""))
+
+	pattern_ABitOfEverythingService_DeepPathEcho_6 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"v2", "example", "oneof_value_nested", "oneof_value_terminal", "echo", "oneof_value_nested.oneof_value_terminal"}, ""))
+
+	pattern_ABitOfEverythingService_DeepPathEcho_7 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5, 1, 0, 4, 1, 5, 6}, []string{"v2", "example", "oneof_value_nested", "oneof_value_deeper_nested", "value", "echo", "oneof_value_nested.oneof_value_deeper_nested.value"}, ""))
+
 	pattern_ABitOfEverythingService_Timeout_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "example", "timeout"}, ""))
 
 	pattern_ABitOfEverythingService_ErrorWithDetails_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "example", "errorwithdetails"}, ""))
@@ -1142,6 +1473,16 @@ var (
 
 	forward_ABitOfEverythingService_DeepPathEcho_2 = runtime.ForwardResponseMessage
 
+	forward_ABitOfEverythingService_DeepPathEcho_3 = runtime.ForwardResponseMessage
+
+	forward_ABitOfEverythingService_DeepPathEcho_4 = runtime.ForwardResponseMessage
+
+	forward_ABitOfEverythingService_DeepPathEcho_5 = runtime.ForwardResponseMessage
+
+	forward_ABitOfEverythingService_DeepPathEcho_6 = runtime.ForwardResponseMessage
+
+	forward_ABitOfEverythingService_DeepPathEcho_7 = runtime.ForwardResponseMessage
+
 	forward_ABitOfEverythingService_Timeout_0 = runtime.ForwardResponseMessage
 
 	forward_ABitOfEverythingService_ErrorWithDetails_0 = runtime.ForwardResponseMessage
diff --git a/examples/proto/examplepb/a_bit_of_everything.proto b/examples/proto/examplepb/a_bit_of_everything.proto
index 3f0f8a83cae..e6d495595c5 100644
--- a/examples/proto/examplepb/a_bit_of_everything.proto
+++ b/examples/proto/examplepb/a_bit_of_everything.proto
@@ -108,7 +108,7 @@ message ABitOfEverything {
 	};
 
 	// Nested is nested type.
-	// NEXT ID: 5
+	// NEXT ID: 7
 	message Nested {
 		// name is nested field.
 		string name = 1;
@@ -123,6 +123,10 @@ message ABitOfEverything {
 		DeepEnum ok = 3;
 
 		sub.StringMessage deeper_nested_value = 4;
+		oneof oneof_value {
+			sub.StringMessage oneof_value_deeper_nested= 15;
+			string oneof_value_terminal = 16;
+		}
 	}
 	Nested single_nested = 25;
 
@@ -198,7 +202,7 @@ service ABitOfEverythingService {
 	rpc Create(ABitOfEverything) returns (ABitOfEverything) {
 		// TODO add enum_value
 		option (google.api.http) = {
-			post: "/v1/example/a_bit_of_everything/{float_value}/{double_value}/{int64_value}/separator/{uint64_value}/{int32_value}/{fixed64_value}/{fixed32_value}/{bool_value}/{string_value=strprefix/*}/{uint32_value}/{sfixed32_value}/{sfixed64_value}/{sint32_value}/{sint64_value}/{nonConventionalNameValue}"
+			post: "/v1/example/a_bit_of_everything/{float_value}/{double_value}/{int64_value}/separator/{uint64_value}/{int32_value}/{fixed64_value}/{fixed32_value}/{bool_value}/{string_value=strprefix/*}/{uint32_value}/{sfixed32_value}/{sfixed64_value}/{sint32_value}/{sint64_value}/{oneof_value_string}/{nonConventionalNameValue}"
 		};
 	}
 
@@ -310,6 +314,28 @@ service ABitOfEverythingService {
 				post: "/v2/example/single_nested/deeper_nested_value/{single_nested.deeper_nested_value.value}"
 				body: "*"
 			}
+
+			// deeper oneof fields in path parameters.
+			additional_bindings {
+				post: "/v2/example/oneof_value_string/echo/{oneof_value_string}"
+				body: "*"
+			}
+			additional_bindings {
+				post: "/v2/example/oneof_value_nested/name/echo/{oneof_value_nested.name}"
+				body: "*"
+			}
+			additional_bindings {
+				post: "/v2/example/oneof_value_nested/deeper_nested_value/value/echo/{oneof_value_nested.deeper_nested_value.value}"
+				body: "*"
+			}
+			additional_bindings {
+				post: "/v2/example/oneof_value_nested/oneof_value_terminal/echo/{oneof_value_nested.oneof_value_terminal}"
+				body: "*"
+			}
+			additional_bindings {
+				post: "/v2/example/oneof_value_nested/oneof_value_deeper_nested/value/echo/{oneof_value_nested.oneof_value_deeper_nested.value}"
+				body: "*"
+			}
 		};
 	}
 	rpc NoBindings(google.protobuf.Duration) returns (google.protobuf.Empty) {}
diff --git a/examples/proto/examplepb/a_bit_of_everything.swagger.json b/examples/proto/examplepb/a_bit_of_everything.swagger.json
index f5194f90726..f949ca37532 100644
--- a/examples/proto/examplepb/a_bit_of_everything.swagger.json
+++ b/examples/proto/examplepb/a_bit_of_everything.swagger.json
@@ -130,6 +130,18 @@
             "required": false,
             "type": "string"
           },
+          {
+            "name": "single_nested.oneof_value_deeper_nested.value",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "single_nested.oneof_value_terminal",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
           {
             "name": "float_value",
             "in": "query",
@@ -294,6 +306,18 @@
             "required": false,
             "type": "string"
           },
+          {
+            "name": "oneof_value_nested.oneof_value_deeper_nested.value",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "oneof_value_nested.oneof_value_terminal",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
           {
             "name": "nonConventionalNameValue",
             "in": "query",
@@ -332,7 +356,7 @@
         }
       }
     },
-    "/v1/example/a_bit_of_everything/{float_value}/{double_value}/{int64_value}/separator/{uint64_value}/{int32_value}/{fixed64_value}/{fixed32_value}/{bool_value}/{string_value}/{uint32_value}/{sfixed32_value}/{sfixed64_value}/{sint32_value}/{sint64_value}/{nonConventionalNameValue}": {
+    "/v1/example/a_bit_of_everything/{float_value}/{double_value}/{int64_value}/separator/{uint64_value}/{int32_value}/{fixed64_value}/{fixed32_value}/{bool_value}/{string_value}/{uint32_value}/{sfixed32_value}/{sfixed64_value}/{sint32_value}/{sint64_value}/{oneof_value_string}/{nonConventionalNameValue}": {
       "post": {
         "operationId": "Create",
         "responses": {
@@ -441,6 +465,12 @@
             "type": "string",
             "format": "int64"
           },
+          {
+            "name": "oneof_value_string",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
           {
             "name": "nonConventionalNameValue",
             "in": "path",
@@ -680,6 +710,166 @@
         ]
       }
     },
+    "/v2/example/oneof_value_nested/deeper_nested_value/value/echo/{oneof_value_nested.deeper_nested_value.value}": {
+      "post": {
+        "operationId": "DeepPathEcho6",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "oneof_value_nested.deeper_nested_value.value",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        ],
+        "tags": [
+          "ABitOfEverythingService"
+        ]
+      }
+    },
+    "/v2/example/oneof_value_nested/name/echo/{oneof_value_nested.name}": {
+      "post": {
+        "operationId": "DeepPathEcho5",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "oneof_value_nested.name",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        ],
+        "tags": [
+          "ABitOfEverythingService"
+        ]
+      }
+    },
+    "/v2/example/oneof_value_nested/oneof_value_deeper_nested/value/echo/{oneof_value_nested.oneof_value_deeper_nested.value}": {
+      "post": {
+        "operationId": "DeepPathEcho8",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "oneof_value_nested.oneof_value_deeper_nested.value",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        ],
+        "tags": [
+          "ABitOfEverythingService"
+        ]
+      }
+    },
+    "/v2/example/oneof_value_nested/oneof_value_terminal/echo/{oneof_value_nested.oneof_value_terminal}": {
+      "post": {
+        "operationId": "DeepPathEcho7",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "oneof_value_nested.oneof_value_terminal",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        ],
+        "tags": [
+          "ABitOfEverythingService"
+        ]
+      }
+    },
+    "/v2/example/oneof_value_string/echo/{oneof_value_string}": {
+      "post": {
+        "operationId": "DeepPathEcho4",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "oneof_value_string",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        ],
+        "tags": [
+          "ABitOfEverythingService"
+        ]
+      }
+    },
     "/v2/example/postwithemptybody/{name}": {
       "post": {
         "operationId": "PostWithEmptyBody",
@@ -810,9 +1000,15 @@
         },
         "deeper_nested_value": {
           "$ref": "#/definitions/subStringMessage"
+        },
+        "oneof_value_deeper_nested": {
+          "$ref": "#/definitions/subStringMessage"
+        },
+        "oneof_value_terminal": {
+          "type": "string"
         }
       },
-      "title": "Nested is nested type.\nNEXT ID: 5"
+      "title": "Nested is nested type.\nNEXT ID: 7"
     },
     "NestedDeepEnum": {
       "type": "string",

From 22be0b039a8303a944c74fd7b7e3da44406aff4d Mon Sep 17 00:00:00 2001
From: Yuki Yugui Sonoda <yugui@yugui.jp>
Date: Mon, 30 Apr 2018 20:48:27 +0900
Subject: [PATCH 4/7] Support oneof fields in request body

Thank you @bonafideyan for the insight in 634904c8333114e0a761e53cf948b25e9ed6a51b.
---
 .../abe/a_bit_of_everything_service_api.go    | 150 ++++++++++
 examples/integration/integration_test.go      |  29 ++
 .../proto/examplepb/a_bit_of_everything.pb.go | 278 +++++++++---------
 .../examplepb/a_bit_of_everything.pb.gw.go    | 154 +++++++++-
 .../proto/examplepb/a_bit_of_everything.proto |  11 +
 .../a_bit_of_everything.swagger.json          |  52 ++++
 .../proto/examplepb/echo_service.pb.gw.go     |  30 +-
 protoc-gen-grpc-gateway/descriptor/types.go   |  66 +++--
 8 files changed, 588 insertions(+), 182 deletions(-)

diff --git a/examples/clients/abe/a_bit_of_everything_service_api.go b/examples/clients/abe/a_bit_of_everything_service_api.go
index 64c9ece37e1..faa360b9caf 100644
--- a/examples/clients/abe/a_bit_of_everything_service_api.go
+++ b/examples/clients/abe/a_bit_of_everything_service_api.go
@@ -289,6 +289,81 @@ func (a ABitOfEverythingServiceApi) DeepPathEcho() (*ExamplepbABitOfEverything,
 	return successPayload, localVarAPIResponse, err
 }
 
+/**
+ * 
+ *
+ * @param body 
+ * @return *ExamplepbABitOfEverything
+ */
+func (a ABitOfEverythingServiceApi) DeepPathEcho10(body ABitOfEverythingNested) (*ExamplepbABitOfEverything, *APIResponse, error) {
+
+	var localVarHttpMethod = strings.ToUpper("Post")
+	// create path and map variables
+	localVarPath := a.Configuration.BasePath + "/v2/example/oneof_value_nested/echo"
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := url.Values{}
+	localVarFormParams := make(map[string]string)
+	var localVarPostBody interface{}
+	var localVarFileName string
+	var localVarFileBytes []byte
+	// authentication '(OAuth2)' required
+	// oauth required
+	if a.Configuration.AccessToken != ""{
+		localVarHeaderParams["Authorization"] =  "Bearer " + a.Configuration.AccessToken
+	}
+	// authentication '(BasicAuth)' required
+	// http basic authentication required
+	if a.Configuration.Username != "" || a.Configuration.Password != ""{
+		localVarHeaderParams["Authorization"] =  "Basic " + a.Configuration.GetBasicAuthEncodedString()
+	}
+	// authentication '(ApiKeyAuth)' required
+	// set key with prefix in header
+	localVarHeaderParams["X-API-Key"] = a.Configuration.GetAPIKeyWithPrefix("X-API-Key")
+	// add default headers if any
+	for key := range a.Configuration.DefaultHeader {
+		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
+	}
+
+	// to determine the Content-Type header
+	localVarHttpContentTypes := []string{ "application/json", "application/x-foo-mime",  }
+
+	// set Content-Type header
+	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
+	if localVarHttpContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHttpContentType
+	}
+	// to determine the Accept header
+	localVarHttpHeaderAccepts := []string{
+		"application/json",
+		"application/x-foo-mime",
+		}
+
+	// set Accept header
+	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+	if localVarHttpHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
+	}
+	// body params
+	localVarPostBody = &body
+	var successPayload = new(ExamplepbABitOfEverything)
+	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
+
+	var localVarURL, _ = url.Parse(localVarPath)
+	localVarURL.RawQuery = localVarQueryParams.Encode()
+	var localVarAPIResponse = &APIResponse{Operation: "DeepPathEcho10", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
+	if localVarHttpResponse != nil {
+		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
+		localVarAPIResponse.Payload = localVarHttpResponse.Body()
+	}
+
+	if err != nil {
+		return successPayload, localVarAPIResponse, err
+	}
+	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
+	return successPayload, localVarAPIResponse, err
+}
+
 /**
  * 
  *
@@ -828,6 +903,81 @@ func (a ABitOfEverythingServiceApi) DeepPathEcho8(oneofValueNestedOneofValueDeep
 	return successPayload, localVarAPIResponse, err
 }
 
+/**
+ * 
+ *
+ * @param body 
+ * @return *ExamplepbABitOfEverything
+ */
+func (a ABitOfEverythingServiceApi) DeepPathEcho9(body string) (*ExamplepbABitOfEverything, *APIResponse, error) {
+
+	var localVarHttpMethod = strings.ToUpper("Post")
+	// create path and map variables
+	localVarPath := a.Configuration.BasePath + "/v2/example/oneof_value_string/echo"
+
+	localVarHeaderParams := make(map[string]string)
+	localVarQueryParams := url.Values{}
+	localVarFormParams := make(map[string]string)
+	var localVarPostBody interface{}
+	var localVarFileName string
+	var localVarFileBytes []byte
+	// authentication '(OAuth2)' required
+	// oauth required
+	if a.Configuration.AccessToken != ""{
+		localVarHeaderParams["Authorization"] =  "Bearer " + a.Configuration.AccessToken
+	}
+	// authentication '(BasicAuth)' required
+	// http basic authentication required
+	if a.Configuration.Username != "" || a.Configuration.Password != ""{
+		localVarHeaderParams["Authorization"] =  "Basic " + a.Configuration.GetBasicAuthEncodedString()
+	}
+	// authentication '(ApiKeyAuth)' required
+	// set key with prefix in header
+	localVarHeaderParams["X-API-Key"] = a.Configuration.GetAPIKeyWithPrefix("X-API-Key")
+	// add default headers if any
+	for key := range a.Configuration.DefaultHeader {
+		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
+	}
+
+	// to determine the Content-Type header
+	localVarHttpContentTypes := []string{ "application/json", "application/x-foo-mime",  }
+
+	// set Content-Type header
+	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
+	if localVarHttpContentType != "" {
+		localVarHeaderParams["Content-Type"] = localVarHttpContentType
+	}
+	// to determine the Accept header
+	localVarHttpHeaderAccepts := []string{
+		"application/json",
+		"application/x-foo-mime",
+		}
+
+	// set Accept header
+	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
+	if localVarHttpHeaderAccept != "" {
+		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
+	}
+	// body params
+	localVarPostBody = &body
+	var successPayload = new(ExamplepbABitOfEverything)
+	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
+
+	var localVarURL, _ = url.Parse(localVarPath)
+	localVarURL.RawQuery = localVarQueryParams.Encode()
+	var localVarAPIResponse = &APIResponse{Operation: "DeepPathEcho9", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
+	if localVarHttpResponse != nil {
+		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
+		localVarAPIResponse.Payload = localVarHttpResponse.Body()
+	}
+
+	if err != nil {
+		return successPayload, localVarAPIResponse, err
+	}
+	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
+	return successPayload, localVarAPIResponse, err
+}
+
 /**
  * 
  *
diff --git a/examples/integration/integration_test.go b/examples/integration/integration_test.go
index 2387e135cd3..0df7587335d 100644
--- a/examples/integration/integration_test.go
+++ b/examples/integration/integration_test.go
@@ -977,6 +977,35 @@ func TestOneof(t *testing.T) {
 				},
 			},
 		},
+
+		// body param: primitive field in a oneof clause
+		{
+			path:    "/v2/example/oneof_value_string/echo",
+			payload: `"foo"`,
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueString{"foo"},
+			},
+		},
+		// body param: message field in a oneof clause
+		{
+			path: "/v2/example/oneof_value_nested/echo",
+			payload: `
+					{
+						"name": "foo",
+						"amount": 123
+					}
+				`,
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueNested{
+					&gw.ABitOfEverything_Nested{
+						Name:   "foo",
+						Amount: 123,
+					},
+				},
+			},
+		},
+		// NOTE: deeply nested fields are not allowed in body by spec.
+
 	} {
 		url := base + spec.path
 		resp, err := http.Post(url, "application/json", strings.NewReader(spec.payload))
diff --git a/examples/proto/examplepb/a_bit_of_everything.pb.go b/examples/proto/examplepb/a_bit_of_everything.pb.go
index d6c340d5f5b..d11f1800c4e 100644
--- a/examples/proto/examplepb/a_bit_of_everything.pb.go
+++ b/examples/proto/examplepb/a_bit_of_everything.pb.go
@@ -1216,142 +1216,144 @@ var _AnotherServiceWithNoBindings_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("examples/proto/examplepb/a_bit_of_everything.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 2192 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x6c, 0x1b, 0xc7,
-	0x15, 0xd6, 0x92, 0x14, 0x2d, 0x3d, 0xfd, 0x51, 0x23, 0x5b, 0x96, 0x68, 0xd9, 0x1a, 0x33, 0x4e,
-	0xbb, 0x56, 0xac, 0xdd, 0x98, 0x0e, 0x0a, 0x87, 0x45, 0xda, 0x52, 0x12, 0x63, 0x1b, 0x8e, 0x65,
-	0x7b, 0xed, 0x38, 0x86, 0xea, 0x54, 0x58, 0x72, 0x87, 0xe4, 0xda, 0xdc, 0x9d, 0xcd, 0xee, 0xac,
-	0x2c, 0x56, 0x55, 0x8b, 0x36, 0x40, 0x8b, 0x9c, 0x0a, 0xa8, 0xf7, 0xa2, 0xe8, 0xad, 0x40, 0x2f,
-	0x45, 0x2f, 0x05, 0x72, 0x28, 0xd0, 0x4b, 0x0f, 0x3d, 0x16, 0xe8, 0xbd, 0x40, 0x4f, 0x3d, 0xf6,
-	0xdc, 0x43, 0x31, 0xb3, 0x43, 0x6a, 0x97, 0x3f, 0xa5, 0x69, 0x07, 0xb9, 0x48, 0x9c, 0x99, 0xef,
-	0x7d, 0xef, 0x6f, 0xde, 0x9b, 0x47, 0x42, 0x91, 0x1c, 0x9a, 0x8e, 0xd7, 0x22, 0x81, 0xee, 0xf9,
-	0x94, 0x51, 0x5d, 0x2e, 0xbd, 0xaa, 0x6e, 0xee, 0x57, 0x6d, 0xb6, 0x4f, 0xeb, 0xfb, 0xe4, 0x80,
-	0xf8, 0x6d, 0xd6, 0xb4, 0xdd, 0x86, 0x26, 0x30, 0x68, 0xbd, 0xe1, 0x7b, 0x35, 0xad, 0x61, 0x32,
-	0xf2, 0xd2, 0x6c, 0x6b, 0x1d, 0x02, 0xad, 0x2b, 0x9a, 0x5f, 0x6b, 0x50, 0xda, 0x68, 0x11, 0xdd,
-	0xf4, 0x6c, 0xdd, 0x74, 0x5d, 0xca, 0x4c, 0x66, 0x53, 0x37, 0x88, 0xc4, 0xf3, 0x17, 0xe4, 0xa9,
-	0x58, 0x55, 0xc3, 0xba, 0x4e, 0x1c, 0x8f, 0xb5, 0xe5, 0xe1, 0xa5, 0xde, 0x43, 0x2b, 0xf4, 0x85,
-	0xb4, 0x3c, 0xc7, 0x3d, 0xf6, 0x06, 0x61, 0x55, 0x77, 0x48, 0x10, 0x98, 0x0d, 0x22, 0x11, 0x97,
-	0xfb, 0x11, 0xc5, 0x1e, 0xc8, 0x7a, 0xaf, 0x12, 0x66, 0x3b, 0x24, 0x60, 0xa6, 0xe3, 0x49, 0xc0,
-	0x35, 0xf1, 0xaf, 0xb6, 0xd9, 0x20, 0xee, 0x66, 0xf0, 0xd2, 0x6c, 0x34, 0x88, 0xaf, 0x53, 0x4f,
-	0x38, 0xd1, 0xef, 0x50, 0xe1, 0xbf, 0x08, 0x72, 0xe5, 0x2d, 0x9b, 0xdd, 0xaf, 0x57, 0xba, 0xa1,
-	0x42, 0x9f, 0xc2, 0x5c, 0x60, 0xbb, 0x8d, 0x16, 0xd9, 0x77, 0x49, 0xc0, 0x88, 0xb5, 0xb2, 0x8a,
-	0x15, 0x75, 0xa6, 0x78, 0x53, 0x1b, 0x11, 0x3c, 0xad, 0x97, 0x49, 0xdb, 0x15, 0xf2, 0xc6, 0x6c,
-	0x44, 0x17, 0xad, 0x10, 0x82, 0x4c, 0x18, 0xda, 0xd6, 0x8a, 0x82, 0x15, 0x75, 0xda, 0x10, 0x9f,
-	0xd1, 0x03, 0xc8, 0x4a, 0x5d, 0x29, 0x9c, 0x7e, 0x23, 0x5d, 0x92, 0x07, 0xad, 0xc3, 0x4c, 0xbd,
-	0x45, 0x4d, 0xb6, 0x7f, 0x60, 0xb6, 0x42, 0xb2, 0x92, 0xc6, 0x8a, 0x9a, 0x32, 0x40, 0x6c, 0x3d,
-	0xe1, 0x3b, 0xe8, 0x32, 0xcc, 0x5a, 0x34, 0xac, 0xb6, 0x88, 0x44, 0x64, 0xb0, 0xa2, 0x2a, 0xc6,
-	0x4c, 0xb4, 0x17, 0x41, 0xd6, 0x61, 0xc6, 0x76, 0xd9, 0xb7, 0xde, 0x93, 0x88, 0x49, 0xac, 0xa8,
-	0x69, 0x03, 0xc4, 0x56, 0x97, 0x23, 0x8c, 0x23, 0xb2, 0x58, 0x51, 0x33, 0xc6, 0x4c, 0x18, 0x83,
-	0x44, 0x1c, 0x37, 0x8a, 0x12, 0x71, 0x06, 0x2b, 0xea, 0xa4, 0xe0, 0xb8, 0x51, 0x8c, 0x00, 0x6f,
-	0xc1, 0x5c, 0xdd, 0x3e, 0x24, 0x56, 0x97, 0x64, 0x0a, 0x2b, 0x6a, 0xd6, 0x98, 0x95, 0x9b, 0x49,
-	0x50, 0x97, 0x67, 0x1a, 0x2b, 0xea, 0x19, 0x09, 0xea, 0x30, 0x5d, 0x04, 0xa8, 0x52, 0xda, 0x92,
-	0x08, 0xc0, 0x8a, 0x3a, 0x65, 0x4c, 0xf3, 0x9d, 0xae, 0xb1, 0x01, 0xf3, 0x6d, 0xb7, 0x21, 0x01,
-	0x33, 0x22, 0xfe, 0x33, 0xd1, 0x5e, 0xd7, 0xd8, 0x6a, 0x9b, 0x91, 0x40, 0x22, 0x2e, 0x62, 0x45,
-	0x9d, 0x35, 0x40, 0x6c, 0x25, 0x1c, 0xee, 0x9a, 0x31, 0x87, 0x15, 0x75, 0x2e, 0x72, 0xb8, 0x63,
-	0xc5, 0x5d, 0x00, 0xe2, 0x86, 0x8e, 0x04, 0xcc, 0x63, 0x45, 0x9d, 0x2f, 0x5e, 0x1b, 0x99, 0xce,
-	0xdd, 0xd0, 0x21, 0xbe, 0x5d, 0xab, 0xb8, 0xa1, 0x63, 0x4c, 0x73, 0xf9, 0x88, 0xec, 0x6d, 0x98,
-	0x0f, 0x92, 0x8e, 0x2f, 0x60, 0x45, 0x5d, 0x30, 0xe6, 0x82, 0x84, 0xe7, 0x5d, 0x58, 0x37, 0x88,
-	0x39, 0xac, 0xa8, 0xb9, 0x0e, 0x2c, 0x96, 0xae, 0x20, 0x6e, 0xfd, 0x22, 0x56, 0xd4, 0x45, 0x63,
-	0x26, 0x88, 0x59, 0x2f, 0x21, 0x5d, 0x1e, 0x84, 0x15, 0x15, 0x45, 0x90, 0x0e, 0x4b, 0x11, 0xce,
-	0xf9, 0xc4, 0x23, 0x26, 0x23, 0xd6, 0x7e, 0x22, 0xa0, 0x4b, 0x38, 0xad, 0x4e, 0x1b, 0x4b, 0x9d,
-	0xc3, 0x47, 0xb1, 0xc0, 0x6a, 0x80, 0xa8, 0x4b, 0x68, 0x3d, 0x42, 0x4a, 0xb1, 0x95, 0x73, 0x3c,
-	0x03, 0xb7, 0x27, 0x8c, 0x9c, 0x38, 0x13, 0xc8, 0x48, 0x08, 0x35, 0x93, 0x78, 0x59, 0x1b, 0x97,
-	0xde, 0xac, 0x0e, 0x93, 0x9a, 0x64, 0x35, 0x3e, 0x83, 0x69, 0xc7, 0xf4, 0xa4, 0x07, 0xcb, 0xa2,
-	0xf8, 0xbe, 0x3b, 0xbe, 0x82, 0x7b, 0xa6, 0x27, 0x48, 0x2b, 0x2e, 0xf3, 0xdb, 0xc6, 0x94, 0x23,
-	0x97, 0xe8, 0x10, 0x96, 0x1c, 0xd3, 0xf3, 0x7a, 0x23, 0x75, 0x5e, 0xe8, 0xb9, 0xfd, 0x5a, 0x7a,
-	0xbc, 0x44, 0x64, 0x23, 0x85, 0x8b, 0x4e, 0xef, 0x7e, 0x4c, 0x73, 0x14, 0x3c, 0xa9, 0x79, 0xe5,
-	0xcd, 0x34, 0x47, 0x41, 0xeb, 0xd7, 0x1c, 0xdb, 0x47, 0x25, 0x58, 0x71, 0xa9, 0xbb, 0x4d, 0xdd,
-	0x03, 0xe2, 0xf2, 0x5e, 0x6b, 0xb6, 0x76, 0x4d, 0x27, 0xea, 0x28, 0x2b, 0x79, 0x51, 0x73, 0x43,
-	0xcf, 0xd1, 0x36, 0x2c, 0x74, 0x1b, 0xba, 0xb4, 0xf8, 0x82, 0x48, 0x7a, 0x5e, 0x8b, 0x1a, 0xbf,
-	0xd6, 0x69, 0xfc, 0xda, 0xe3, 0x0e, 0xce, 0x98, 0xef, 0x8a, 0x44, 0x24, 0xcf, 0xa0, 0x7b, 0x07,
-	0xf7, 0x63, 0xa5, 0xb8, 0x86, 0xd3, 0x63, 0x97, 0xe2, 0x62, 0x87, 0xa8, 0xd2, 0x29, 0xc9, 0xfc,
-	0xef, 0xd3, 0x90, 0x3d, 0xed, 0xe4, 0xae, 0xe9, 0x90, 0x4e, 0x27, 0xe7, 0x9f, 0xd1, 0x32, 0x64,
-	0x4d, 0x87, 0x86, 0x2e, 0x5b, 0x49, 0x89, 0xde, 0x20, 0x57, 0xe8, 0x21, 0xa4, 0xe8, 0x0b, 0xd1,
-	0x86, 0xe7, 0x8b, 0xe5, 0xd7, 0xbd, 0xc1, 0xda, 0x0e, 0x21, 0x9e, 0x30, 0x2c, 0x45, 0x5f, 0xa0,
-	0xa7, 0xb0, 0x64, 0x11, 0xe2, 0x11, 0x3f, 0x99, 0xe2, 0x8c, 0x08, 0x98, 0x3a, 0x44, 0x47, 0x10,
-	0x56, 0xb5, 0xe8, 0x9e, 0xdc, 0x8b, 0x1e, 0x56, 0x63, 0x31, 0x22, 0x89, 0xa7, 0x90, 0xc0, 0x6a,
-	0xbc, 0xfc, 0x12, 0x5a, 0x44, 0x07, 0x1a, 0x83, 0xff, 0xf6, 0x84, 0xb1, 0x7c, 0x5a, 0x75, 0x3b,
-	0x31, 0x5d, 0xa8, 0x08, 0x67, 0xe3, 0x6a, 0x18, 0xf1, 0x1d, 0xdb, 0x35, 0x5b, 0xa2, 0x79, 0xf1,
-	0xbe, 0x80, 0x4e, 0xe5, 0x1e, 0xcb, 0xb3, 0xc2, 0x3a, 0x4c, 0x75, 0x82, 0x80, 0xa6, 0x61, 0xf2,
-	0xc3, 0xf2, 0x47, 0x8f, 0x2a, 0xb9, 0x09, 0x34, 0x05, 0x99, 0xc7, 0xc6, 0xc7, 0x95, 0x9c, 0xb2,
-	0x35, 0x07, 0x33, 0x31, 0xd2, 0xbc, 0x0d, 0x73, 0x89, 0xe2, 0x44, 0x39, 0x48, 0xbf, 0x20, 0x6d,
-	0x99, 0x33, 0xfe, 0x11, 0x6d, 0xc1, 0x64, 0x14, 0xb9, 0xd4, 0x6b, 0x34, 0xeb, 0x48, 0xb4, 0x94,
-	0xba, 0xa9, 0xe4, 0x77, 0x60, 0x79, 0x70, 0x7d, 0x0e, 0xd0, 0x79, 0x36, 0xae, 0x73, 0x3a, 0xce,
-	0xf2, 0xe3, 0x0e, 0x4b, 0x6f, 0xad, 0x0d, 0x60, 0xd9, 0x8d, 0xb3, 0xbc, 0xc9, 0xd4, 0x70, 0xaa,
-	0xbf, 0xf4, 0xfd, 0x93, 0xf2, 0xd3, 0x8d, 0x27, 0x70, 0xe5, 0x43, 0xdb, 0xb5, 0x30, 0x0d, 0x19,
-	0x76, 0xa8, 0x4f, 0xb0, 0x59, 0xe5, 0x1f, 0xfb, 0x46, 0x25, 0xad, 0xc9, 0x98, 0x17, 0x94, 0x74,
-	0xbd, 0x61, 0xb3, 0x66, 0x58, 0xd5, 0x6a, 0xd4, 0xd1, 0xb9, 0x0d, 0x9b, 0xa4, 0x46, 0x83, 0x76,
-	0xc0, 0x88, 0x5c, 0x4a, 0x93, 0x7a, 0x92, 0x53, 0xc8, 0x43, 0x66, 0x8b, 0x5a, 0xed, 0x41, 0x85,
-	0x54, 0x78, 0x06, 0x0b, 0xf2, 0x06, 0x7d, 0x62, 0xb3, 0xa6, 0x80, 0xcd, 0x43, 0xaa, 0x3b, 0x37,
-	0xa5, 0x6c, 0x0b, 0xbd, 0x0f, 0x19, 0xcb, 0x64, 0xa6, 0xf4, 0xfe, 0xed, 0x91, 0xde, 0x73, 0x12,
-	0x43, 0x88, 0x6c, 0x60, 0x98, 0x89, 0x65, 0x91, 0x5f, 0x9f, 0xbd, 0x8a, 0x71, 0x3f, 0x37, 0x81,
-	0xce, 0x40, 0xfa, 0xfe, 0x6e, 0x25, 0xa7, 0x14, 0xff, 0xb0, 0x02, 0xe7, 0x7b, 0xfd, 0x7d, 0x44,
-	0xfc, 0x03, 0xbb, 0x46, 0xd0, 0x1f, 0xd3, 0x90, 0xdd, 0xf6, 0x79, 0x63, 0x40, 0xd7, 0xc7, 0x8e,
-	0x79, 0x7e, 0x7c, 0x91, 0xc2, 0x5f, 0x52, 0x3f, 0xfb, 0xfb, 0xbf, 0x7e, 0x95, 0xfa, 0x32, 0x55,
-	0xf8, 0x53, 0x4a, 0x3f, 0xb8, 0xde, 0x99, 0xf5, 0x07, 0x4d, 0xfa, 0xfa, 0x51, 0x6c, 0xee, 0x3b,
-	0xd6, 0x8f, 0xe2, 0x43, 0xde, 0xb1, 0x7e, 0x14, 0x7b, 0xdc, 0x8f, 0xf5, 0x80, 0x78, 0xa6, 0x6f,
-	0x32, 0xea, 0xeb, 0x47, 0x61, 0xe2, 0xe0, 0x28, 0x36, 0x26, 0x1c, 0xeb, 0x47, 0x89, 0xd9, 0xa2,
-	0xb3, 0x8e, 0x9d, 0x9f, 0x8e, 0x5d, 0xc7, 0xfa, 0x51, 0xfc, 0xa5, 0xfb, 0x20, 0x60, 0xbe, 0xe7,
-	0x93, 0xba, 0x7d, 0xa8, 0x6f, 0x1c, 0x47, 0x4a, 0x62, 0x62, 0x41, 0x2f, 0x4f, 0xd0, 0xab, 0x28,
-	0xe8, 0x11, 0x48, 0x1a, 0xd9, 0x3f, 0x52, 0x1c, 0xeb, 0x47, 0xc3, 0xde, 0x96, 0x63, 0xf4, 0x6b,
-	0x05, 0x20, 0xca, 0x9a, 0xb8, 0x4d, 0x5f, 0x4f, 0xe6, 0x36, 0x44, 0xe2, 0xae, 0x14, 0xd6, 0x47,
-	0xa4, 0xad, 0xa4, 0x6c, 0xa0, 0x1f, 0x41, 0xf6, 0x23, 0x4a, 0x5f, 0x84, 0x1e, 0x5a, 0xe0, 0x7d,
-	0xb4, 0xa8, 0xdd, 0xb1, 0x64, 0x09, 0xbc, 0x8e, 0x66, 0x4d, 0x68, 0x56, 0xd1, 0x37, 0x46, 0x5e,
-	0x18, 0xfe, 0x15, 0xe4, 0x18, 0xfd, 0x5c, 0x81, 0xec, 0xc7, 0x9e, 0xf5, 0x9a, 0x97, 0x7a, 0xb9,
-	0xef, 0x81, 0xae, 0xf0, 0xef, 0x86, 0x85, 0xeb, 0xc2, 0x8a, 0x77, 0xf2, 0xaf, 0x68, 0x05, 0x0f,
-	0xc3, 0x2f, 0x15, 0xc8, 0xee, 0x90, 0x16, 0x61, 0xa4, 0x3f, 0x0e, 0xc3, 0xd4, 0x3c, 0x3b, 0x29,
-	0xbf, 0x53, 0xbd, 0x0a, 0xf3, 0x00, 0x65, 0xcf, 0xbe, 0x4b, 0xda, 0xe5, 0x90, 0x35, 0xd1, 0x04,
-	0x9c, 0x87, 0xec, 0x7d, 0xfe, 0xb1, 0x88, 0xe6, 0x20, 0xe3, 0x13, 0xd3, 0x82, 0xc9, 0x97, 0xbe,
-	0xcd, 0x48, 0x14, 0x9a, 0x8d, 0x57, 0x0d, 0xcd, 0x3f, 0x15, 0x98, 0xba, 0x45, 0xd8, 0xc3, 0x90,
-	0xf8, 0xed, 0xaf, 0x32, 0x38, 0x5f, 0x28, 0x27, 0x65, 0xa3, 0xb0, 0x0b, 0x6b, 0x83, 0x9a, 0x6d,
-	0x57, 0xe1, 0x98, 0x4d, 0xf6, 0xa9, 0x22, 0xbc, 0xd3, 0xd0, 0xb5, 0x51, 0xde, 0x7d, 0xc6, 0xe9,
-	0x3b, 0x3e, 0xfe, 0x35, 0x05, 0x99, 0x4a, 0xad, 0x49, 0xd1, 0x2b, 0xbf, 0xec, 0xf9, 0x57, 0x46,
-	0x16, 0xfe, 0xad, 0x9c, 0x94, 0x3f, 0x57, 0x60, 0x96, 0xd4, 0x9a, 0x14, 0x07, 0x51, 0x17, 0x85,
-	0x29, 0xb1, 0xf2, 0xbd, 0x1a, 0x5a, 0x7c, 0x14, 0x3a, 0x8e, 0xe9, 0xb7, 0x4b, 0xb8, 0x22, 0xb7,
-	0xf2, 0xb9, 0x1d, 0x12, 0xd4, 0x7c, 0x5b, 0x7c, 0x73, 0x17, 0xbb, 0x85, 0x1d, 0x40, 0xc9, 0x30,
-	0x09, 0x6b, 0xc7, 0x0c, 0x8e, 0x08, 0xcd, 0xa7, 0xa3, 0x43, 0xc3, 0x4d, 0xd3, 0x8f, 0xa2, 0x46,
-	0xb3, 0xb7, 0x5a, 0xc8, 0xe9, 0x07, 0xc5, 0x2e, 0x9e, 0x9f, 0x95, 0xa2, 0x17, 0x73, 0x0f, 0xa1,
-	0xbe, 0x23, 0xf4, 0x9b, 0x2c, 0xcc, 0xf2, 0x19, 0xe5, 0x81, 0xc9, 0x9a, 0xc2, 0xc6, 0xaf, 0xa7,
-	0xd3, 0xfc, 0x6e, 0x52, 0x38, 0xf7, 0xdb, 0xc9, 0xc2, 0x95, 0x11, 0xde, 0x7d, 0x9b, 0x9b, 0xb9,
-	0xf7, 0x7e, 0xe1, 0xbd, 0x91, 0xd7, 0x3f, 0xf1, 0x3b, 0x88, 0xc6, 0xdf, 0x65, 0x5e, 0xa1, 0x7b,
-	0xcf, 0x0a, 0x9f, 0xc4, 0xbd, 0x4e, 0xa0, 0xf4, 0x01, 0x33, 0x69, 0x2f, 0xd1, 0x00, 0x88, 0x16,
-	0xc5, 0x9a, 0xb3, 0x7f, 0x50, 0xb8, 0x19, 0x67, 0xef, 0xef, 0xf2, 0x32, 0x3b, 0x03, 0xda, 0x3f,
-	0x17, 0xbf, 0x55, 0xd8, 0x1a, 0x26, 0x2e, 0x2d, 0xe4, 0x7e, 0x0c, 0xe0, 0xe8, 0xf5, 0xf2, 0xb3,
-	0x42, 0x6b, 0x04, 0xd1, 0x20, 0x57, 0xa3, 0xbf, 0x43, 0xd9, 0xff, 0xbf, 0xeb, 0x8d, 0x42, 0x75,
-	0x84, 0xca, 0x41, 0x03, 0xf3, 0x70, 0x6d, 0x83, 0xd0, 0x42, 0xd1, 0x71, 0xe1, 0x70, 0x0c, 0x45,
-	0x09, 0xa3, 0x47, 0x79, 0x38, 0x54, 0xf0, 0xd4, 0x4f, 0x54, 0x06, 0xd8, 0xa5, 0x5b, 0xb6, 0x6b,
-	0xd9, 0x6e, 0x23, 0x40, 0xab, 0x7d, 0xed, 0x71, 0x47, 0xfe, 0x74, 0x38, 0xb4, 0x73, 0x4e, 0xa0,
-	0x27, 0x70, 0x86, 0x7f, 0x05, 0xa4, 0x21, 0x43, 0x43, 0x40, 0x43, 0x85, 0x2f, 0x88, 0x42, 0x39,
-	0x87, 0x96, 0xe2, 0x21, 0x60, 0x92, 0xac, 0x09, 0xb9, 0x8a, 0xef, 0x53, 0x9f, 0x4f, 0x9d, 0x3b,
-	0x84, 0x99, 0x76, 0x2b, 0x18, 0x5b, 0xc1, 0x15, 0xa1, 0xe0, 0x12, 0x5a, 0x4b, 0xf4, 0x06, 0xce,
-	0xfa, 0xd2, 0x66, 0x4d, 0x4b, 0xb2, 0xfe, 0x42, 0x01, 0x74, 0x8b, 0xb0, 0xde, 0x29, 0xf7, 0xdd,
-	0x91, 0xa5, 0xdf, 0x23, 0x31, 0xd4, 0x8c, 0x6f, 0x0a, 0x33, 0x2e, 0x17, 0x56, 0xe3, 0x66, 0x70,
-	0x0b, 0xaa, 0xd4, 0x6a, 0xeb, 0x47, 0xfc, 0xb9, 0x15, 0xd3, 0x30, 0xfa, 0x5c, 0x81, 0xc5, 0x07,
-	0x34, 0x60, 0x9c, 0x51, 0x88, 0x0a, 0x43, 0x5e, 0x6d, 0xa0, 0x1e, 0xaa, 0x5d, 0x17, 0xda, 0xaf,
-	0xf2, 0x6e, 0x74, 0xaa, 0xdd, 0xa3, 0x01, 0xe3, 0x16, 0x88, 0x1f, 0x8e, 0x23, 0x33, 0x3a, 0xf5,
-	0x96, 0xff, 0xb3, 0x72, 0x52, 0xfe, 0x52, 0x41, 0xf5, 0x21, 0x53, 0x37, 0xb6, 0x62, 0x2f, 0xc2,
-	0xe6, 0x26, 0x7e, 0xd9, 0xb4, 0x6b, 0x4d, 0x1c, 0x34, 0x69, 0xd8, 0xb2, 0xb0, 0x4b, 0x19, 0xae,
-	0x12, 0x1c, 0x06, 0xc4, 0xc2, 0xb6, 0x8b, 0xbd, 0x96, 0x59, 0x23, 0x98, 0xd6, 0x31, 0x6b, 0x12,
-	0x6c, 0xd1, 0x5a, 0xe8, 0x10, 0x37, 0xfa, 0xe5, 0x17, 0xd7, 0xa8, 0xc3, 0x17, 0x97, 0xf3, 0x0f,
-	0x61, 0x7d, 0xd0, 0xb3, 0xcb, 0x3b, 0x76, 0x67, 0xce, 0x1f, 0xf3, 0x71, 0x29, 0x3e, 0x87, 0xb3,
-	0x35, 0xd3, 0x21, 0xad, 0x6d, 0x33, 0x20, 0x92, 0x83, 0xcf, 0x9f, 0xc8, 0x80, 0x49, 0x11, 0x93,
-	0xb1, 0x2f, 0xd2, 0xaa, 0x88, 0xe1, 0x12, 0x5a, 0x4c, 0x5c, 0x24, 0x7e, 0x54, 0xfc, 0x01, 0xac,
-	0x95, 0x5d, 0xca, 0x9a, 0xc4, 0x97, 0x9a, 0x78, 0xf2, 0x62, 0x45, 0xf5, 0x9d, 0x44, 0x89, 0x8d,
-	0xab, 0x78, 0x62, 0xeb, 0xa7, 0x93, 0x27, 0xe5, 0xff, 0x64, 0x10, 0x83, 0xa5, 0x32, 0xde, 0xb2,
-	0x19, 0x0f, 0x66, 0xec, 0xb1, 0x79, 0x0a, 0x67, 0x1b, 0xc6, 0x83, 0xed, 0xcd, 0x5b, 0x91, 0xe7,
-	0xd8, 0xf3, 0xe9, 0x73, 0x52, 0x63, 0xe3, 0x46, 0x2c, 0x9f, 0x73, 0xa9, 0x4b, 0xbe, 0x27, 0x3d,
-	0xe3, 0xe8, 0x62, 0xfa, 0xba, 0xf6, 0xee, 0x46, 0x5a, 0x49, 0x65, 0x8a, 0x39, 0xd3, 0xf3, 0x5a,
-	0x76, 0x4d, 0xa4, 0x4d, 0x7f, 0x1e, 0x50, 0xb7, 0xb8, 0x1c, 0xdf, 0x39, 0xdc, 0xac, 0x53, 0xba,
-	0xe9, 0xd8, 0x0e, 0x29, 0xf5, 0x21, 0x4b, 0x43, 0x90, 0x7b, 0x5f, 0xa4, 0x60, 0x01, 0xa6, 0xb7,
-	0xcc, 0xc0, 0xae, 0x89, 0x11, 0x31, 0x35, 0xa5, 0xc0, 0xc5, 0xc4, 0xd0, 0xb8, 0x30, 0x95, 0xca,
-	0x4f, 0x3f, 0xdd, 0x2c, 0x3f, 0xb8, 0xb3, 0x79, 0x97, 0xb4, 0x71, 0x0a, 0xfe, 0xa1, 0x74, 0x87,
-	0xc8, 0xbf, 0x29, 0x53, 0x69, 0x35, 0x53, 0x7c, 0xab, 0xe3, 0x64, 0xcc, 0x6e, 0x9d, 0x9a, 0x21,
-	0x6b, 0xea, 0xfc, 0x0f, 0xf5, 0xed, 0x1f, 0x92, 0xd2, 0xfa, 0x70, 0x10, 0xa3, 0x2f, 0x88, 0xbb,
-	0xf5, 0x13, 0xc8, 0x47, 0x33, 0x29, 0x42, 0xb7, 0x7c, 0xd3, 0x65, 0x01, 0xe6, 0x0b, 0x6c, 0xd6,
-	0x6a, 0x24, 0x08, 0x60, 0x4d, 0x4e, 0xaa, 0x68, 0x49, 0x1e, 0x8a, 0x55, 0xe7, 0x74, 0x1b, 0x26,
-	0x4d, 0xcb, 0xb1, 0x5d, 0x54, 0x4a, 0x88, 0xba, 0x56, 0x02, 0x86, 0x19, 0xc5, 0x02, 0x66, 0x07,
-	0x8c, 0xf7, 0xd3, 0x03, 0x82, 0x6d, 0xb7, 0x4e, 0x7d, 0x47, 0x84, 0xa5, 0xba, 0x0e, 0x73, 0xf1,
-	0x50, 0x4c, 0xf4, 0x4e, 0xcf, 0xd5, 0xab, 0x43, 0xe7, 0xe7, 0x5e, 0xa8, 0x7f, 0x07, 0xce, 0xdf,
-	0x3b, 0xad, 0xa1, 0xf8, 0xd5, 0x18, 0xf7, 0x4a, 0xec, 0x4d, 0x77, 0xfb, 0x4b, 0x35, 0x2b, 0x6e,
-	0xe5, 0x8d, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x35, 0x42, 0x75, 0x40, 0xeb, 0x1a, 0x00, 0x00,
+	// 2211 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x6c, 0xdb, 0xc8,
+	0x15, 0x36, 0x25, 0x59, 0xb1, 0x9e, 0xff, 0xe4, 0x71, 0xe2, 0xd8, 0x8a, 0x13, 0x4f, 0x98, 0x6c,
+	0xab, 0x78, 0x63, 0x71, 0xa3, 0x2c, 0x8a, 0x44, 0xc5, 0xb6, 0x95, 0x6d, 0x6d, 0x12, 0x64, 0xe3,
+	0x24, 0x4c, 0x36, 0x1b, 0xb8, 0xd9, 0x1a, 0x94, 0x38, 0x92, 0x98, 0x88, 0x1c, 0x2e, 0x39, 0x74,
+	0xac, 0xba, 0x6e, 0xd1, 0x2e, 0xd0, 0x62, 0x4f, 0x05, 0x5c, 0xa0, 0xe8, 0xa9, 0x3d, 0xf6, 0xd2,
+	0x5b, 0x2f, 0x05, 0xf6, 0x50, 0xa0, 0x97, 0x1e, 0x7a, 0x2c, 0xd0, 0x7b, 0x81, 0x9e, 0x7a, 0xec,
+	0xb9, 0x87, 0x62, 0x86, 0x23, 0x99, 0xd4, 0xcf, 0xca, 0x4a, 0x8a, 0xbd, 0x48, 0x9c, 0x99, 0xef,
+	0x7d, 0xef, 0x67, 0xe6, 0xbd, 0x79, 0x24, 0x14, 0xc9, 0x81, 0x61, 0xbb, 0x2d, 0xe2, 0x6b, 0xae,
+	0x47, 0x19, 0xd5, 0xe4, 0xd0, 0xad, 0x6a, 0xc6, 0x5e, 0xd5, 0x62, 0x7b, 0xb4, 0xbe, 0x47, 0xf6,
+	0x89, 0xd7, 0x66, 0x4d, 0xcb, 0x69, 0x14, 0x04, 0x06, 0xad, 0x35, 0x3c, 0xb7, 0x56, 0x68, 0x18,
+	0x8c, 0xbc, 0x36, 0xda, 0x85, 0x0e, 0x41, 0xa1, 0x2b, 0x9a, 0x5b, 0x6d, 0x50, 0xda, 0x68, 0x11,
+	0xcd, 0x70, 0x2d, 0xcd, 0x70, 0x1c, 0xca, 0x0c, 0x66, 0x51, 0xc7, 0x0f, 0xc5, 0x73, 0x17, 0xe4,
+	0xaa, 0x18, 0x55, 0x83, 0xba, 0x46, 0x6c, 0x97, 0xb5, 0xe5, 0xe2, 0xa5, 0xde, 0x45, 0x33, 0xf0,
+	0x84, 0xb4, 0x5c, 0xc7, 0x3d, 0xf6, 0xfa, 0x41, 0x55, 0xb3, 0x89, 0xef, 0x1b, 0x0d, 0x22, 0x11,
+	0x97, 0xfb, 0x11, 0xc5, 0x1e, 0xc8, 0x5a, 0xaf, 0x12, 0x66, 0xd9, 0xc4, 0x67, 0x86, 0xed, 0x4a,
+	0xc0, 0x75, 0xf1, 0x57, 0xdb, 0x68, 0x10, 0x67, 0xc3, 0x7f, 0x6d, 0x34, 0x1a, 0xc4, 0xd3, 0xa8,
+	0x2b, 0x9c, 0xe8, 0x77, 0x48, 0xfd, 0x2f, 0x82, 0x6c, 0x79, 0xd3, 0x62, 0x0f, 0xeb, 0x95, 0x6e,
+	0xa8, 0xd0, 0xa7, 0x30, 0xeb, 0x5b, 0x4e, 0xa3, 0x45, 0xf6, 0x1c, 0xe2, 0x33, 0x62, 0x2e, 0xaf,
+	0x60, 0x25, 0x3f, 0x5d, 0xbc, 0x55, 0x18, 0x11, 0xbc, 0x42, 0x2f, 0x53, 0x61, 0x47, 0xc8, 0xeb,
+	0x33, 0x21, 0x5d, 0x38, 0x42, 0x08, 0x52, 0x41, 0x60, 0x99, 0xcb, 0x0a, 0x56, 0xf2, 0x19, 0x5d,
+	0x3c, 0xa3, 0x47, 0x90, 0x96, 0xba, 0x12, 0x38, 0xf9, 0x56, 0xba, 0x24, 0x0f, 0x5a, 0x83, 0xe9,
+	0x7a, 0x8b, 0x1a, 0x6c, 0x6f, 0xdf, 0x68, 0x05, 0x64, 0x39, 0x89, 0x95, 0x7c, 0x42, 0x07, 0x31,
+	0xf5, 0x8c, 0xcf, 0xa0, 0xcb, 0x30, 0x63, 0xd2, 0xa0, 0xda, 0x22, 0x12, 0x91, 0xc2, 0x4a, 0x5e,
+	0xd1, 0xa7, 0xc3, 0xb9, 0x10, 0xb2, 0x06, 0xd3, 0x96, 0xc3, 0xbe, 0xf5, 0xbe, 0x44, 0x4c, 0x62,
+	0x25, 0x9f, 0xd4, 0x41, 0x4c, 0x75, 0x39, 0x82, 0x28, 0x22, 0x8d, 0x95, 0x7c, 0x4a, 0x9f, 0x0e,
+	0x22, 0x90, 0x90, 0xe3, 0x66, 0x51, 0x22, 0xce, 0x60, 0x25, 0x3f, 0x29, 0x38, 0x6e, 0x16, 0x43,
+	0xc0, 0x15, 0x98, 0xad, 0x5b, 0x07, 0xc4, 0xec, 0x92, 0x4c, 0x61, 0x25, 0x9f, 0xd6, 0x67, 0xe4,
+	0x64, 0x1c, 0xd4, 0xe5, 0xc9, 0x60, 0x25, 0x7f, 0x46, 0x82, 0x3a, 0x4c, 0x17, 0x01, 0xaa, 0x94,
+	0xb6, 0x24, 0x02, 0xb0, 0x92, 0x9f, 0xd2, 0x33, 0x7c, 0xa6, 0x6b, 0xac, 0xcf, 0x3c, 0xcb, 0x69,
+	0x48, 0xc0, 0xb4, 0x88, 0xff, 0x74, 0x38, 0xd7, 0x35, 0xb6, 0xda, 0x66, 0xc4, 0x97, 0x88, 0x8b,
+	0x58, 0xc9, 0xcf, 0xe8, 0x20, 0xa6, 0x62, 0x0e, 0x77, 0xcd, 0x98, 0xc5, 0x4a, 0x7e, 0x36, 0x74,
+	0xb8, 0x63, 0xc5, 0x7d, 0x00, 0xe2, 0x04, 0xb6, 0x04, 0xcc, 0x61, 0x25, 0x3f, 0x57, 0xbc, 0x3e,
+	0x72, 0x3b, 0x77, 0x02, 0x9b, 0x78, 0x56, 0xad, 0xe2, 0x04, 0xb6, 0x9e, 0xe1, 0xf2, 0x21, 0xd9,
+	0x3b, 0x30, 0xe7, 0xc7, 0x1d, 0x9f, 0xc7, 0x4a, 0x7e, 0x5e, 0x9f, 0xf5, 0x63, 0x9e, 0x77, 0x61,
+	0xdd, 0x20, 0x66, 0xb1, 0x92, 0xcf, 0x76, 0x60, 0x91, 0xed, 0xf2, 0xa3, 0xd6, 0x2f, 0x60, 0x25,
+	0xbf, 0xa0, 0x4f, 0xfb, 0x11, 0xeb, 0x25, 0xa4, 0xcb, 0x83, 0xb0, 0x92, 0x47, 0x21, 0xa4, 0xc3,
+	0x52, 0x84, 0x73, 0x1e, 0x71, 0x89, 0xc1, 0x88, 0xb9, 0x17, 0x0b, 0xe8, 0x22, 0x4e, 0xe6, 0x33,
+	0xfa, 0x62, 0x67, 0xf1, 0x49, 0x24, 0xb0, 0x05, 0x40, 0xd4, 0x21, 0xb4, 0x1e, 0x22, 0xa5, 0xd8,
+	0xf2, 0x39, 0xbe, 0x03, 0x77, 0x27, 0xf4, 0xac, 0x58, 0x13, 0xc8, 0x50, 0x08, 0x35, 0xe3, 0x78,
+	0x99, 0x1b, 0x97, 0xde, 0x2e, 0x0f, 0xe3, 0x9a, 0x64, 0x36, 0xbe, 0x80, 0x8c, 0x6d, 0xb8, 0xd2,
+	0x83, 0x25, 0x91, 0x7c, 0xdf, 0x1d, 0x5f, 0xc1, 0x03, 0xc3, 0x15, 0xa4, 0x15, 0x87, 0x79, 0x6d,
+	0x7d, 0xca, 0x96, 0x43, 0x74, 0x00, 0x8b, 0xb6, 0xe1, 0xba, 0xbd, 0x91, 0x3a, 0x2f, 0xf4, 0xdc,
+	0x7d, 0x23, 0x3d, 0x6e, 0x2c, 0xb2, 0xa1, 0xc2, 0x05, 0xbb, 0x77, 0x3e, 0xa2, 0x39, 0x0c, 0x9e,
+	0xd4, 0xbc, 0xfc, 0x76, 0x9a, 0xc3, 0xa0, 0xf5, 0x6b, 0x8e, 0xcc, 0xa3, 0x12, 0x2c, 0x3b, 0xd4,
+	0xd9, 0xa2, 0xce, 0x3e, 0x71, 0x78, 0xad, 0x35, 0x5a, 0x3b, 0x86, 0x1d, 0x56, 0x94, 0xe5, 0x9c,
+	0xc8, 0xb9, 0xa1, 0xeb, 0x68, 0x0b, 0xe6, 0xbb, 0x05, 0x5d, 0x5a, 0x7c, 0x41, 0x6c, 0x7a, 0xae,
+	0x10, 0x16, 0xfe, 0x42, 0xa7, 0xf0, 0x17, 0x9e, 0x76, 0x70, 0xfa, 0x5c, 0x57, 0x24, 0x24, 0x79,
+	0x01, 0xdd, 0x33, 0xb8, 0x17, 0x49, 0xc5, 0x55, 0x9c, 0x1c, 0x3b, 0x15, 0x17, 0x3a, 0x44, 0x95,
+	0x4e, 0x4a, 0xe6, 0xfe, 0x90, 0x84, 0xf4, 0x49, 0x25, 0x77, 0x0c, 0x9b, 0x74, 0x2a, 0x39, 0x7f,
+	0x46, 0x4b, 0x90, 0x36, 0x6c, 0x1a, 0x38, 0x6c, 0x39, 0x21, 0x6a, 0x83, 0x1c, 0xa1, 0xc7, 0x90,
+	0xa0, 0xaf, 0x44, 0x19, 0x9e, 0x2b, 0x96, 0xdf, 0xf4, 0x04, 0x17, 0xb6, 0x09, 0x71, 0x85, 0x61,
+	0x09, 0xfa, 0x0a, 0x3d, 0x87, 0x45, 0x93, 0x10, 0x97, 0x78, 0xf1, 0x2d, 0x4e, 0x89, 0x80, 0xe5,
+	0x87, 0xe8, 0xf0, 0x83, 0x6a, 0x21, 0x3c, 0x27, 0x0f, 0xc2, 0x8b, 0x55, 0x5f, 0x08, 0x49, 0xa2,
+	0x5b, 0x48, 0x60, 0x25, 0x9a, 0x7e, 0x31, 0x2d, 0xa2, 0x02, 0x8d, 0xc1, 0x7f, 0x77, 0x42, 0x5f,
+	0x3a, 0xc9, 0xba, 0xed, 0x88, 0x2e, 0x54, 0x84, 0xb3, 0x51, 0x35, 0x8c, 0x78, 0xb6, 0xe5, 0x18,
+	0x2d, 0x51, 0xbc, 0x78, 0x5d, 0x40, 0x27, 0x72, 0x4f, 0xe5, 0x9a, 0xba, 0x06, 0x53, 0x9d, 0x20,
+	0xa0, 0x0c, 0x4c, 0x7e, 0x58, 0xfe, 0xe8, 0x49, 0x25, 0x3b, 0x81, 0xa6, 0x20, 0xf5, 0x54, 0xff,
+	0xb8, 0x92, 0x55, 0x36, 0x67, 0x61, 0x3a, 0x42, 0x9a, 0xb3, 0x60, 0x36, 0x96, 0x9c, 0x28, 0x0b,
+	0xc9, 0x57, 0xa4, 0x2d, 0xf7, 0x8c, 0x3f, 0xa2, 0x4d, 0x98, 0x0c, 0x23, 0x97, 0x78, 0x83, 0x62,
+	0x1d, 0x8a, 0x96, 0x12, 0xb7, 0x94, 0xdc, 0x36, 0x2c, 0x0d, 0xce, 0xcf, 0x01, 0x3a, 0xcf, 0x46,
+	0x75, 0x66, 0xa2, 0x2c, 0x3f, 0xee, 0xb0, 0xf4, 0xe6, 0xda, 0x00, 0x96, 0x9d, 0x28, 0xcb, 0xdb,
+	0x74, 0x0d, 0x27, 0xfa, 0x4b, 0xdf, 0x3f, 0x2e, 0x3f, 0x5f, 0x7f, 0x06, 0x57, 0x3f, 0xb4, 0x1c,
+	0x13, 0xd3, 0x80, 0x61, 0x9b, 0x7a, 0x04, 0x1b, 0x55, 0xfe, 0xd8, 0xd7, 0x2a, 0x15, 0x9a, 0x8c,
+	0xb9, 0x7e, 0x49, 0xd3, 0x1a, 0x16, 0x6b, 0x06, 0xd5, 0x42, 0x8d, 0xda, 0x1a, 0xb7, 0x61, 0x83,
+	0xd4, 0xa8, 0xdf, 0xf6, 0x19, 0x91, 0x43, 0x69, 0x52, 0xcf, 0xe6, 0xa8, 0x39, 0x48, 0x6d, 0x52,
+	0xb3, 0x3d, 0x28, 0x91, 0xd4, 0x17, 0x30, 0x2f, 0x4f, 0xd0, 0x27, 0x16, 0x6b, 0x0a, 0xd8, 0x1c,
+	0x24, 0xba, 0x7d, 0x53, 0xc2, 0x32, 0xd1, 0x6d, 0x48, 0x99, 0x06, 0x33, 0xa4, 0xf7, 0xef, 0x8c,
+	0xf4, 0x9e, 0x93, 0xe8, 0x42, 0x64, 0x1d, 0xc3, 0x74, 0x64, 0x17, 0xf9, 0xf1, 0xd9, 0xad, 0xe8,
+	0x0f, 0xb3, 0x13, 0xe8, 0x0c, 0x24, 0x1f, 0xee, 0x54, 0xb2, 0x4a, 0xf1, 0xf7, 0x2b, 0x70, 0xbe,
+	0xd7, 0xdf, 0x27, 0xc4, 0xdb, 0xb7, 0x6a, 0x04, 0xfd, 0x31, 0x09, 0xe9, 0x2d, 0x8f, 0x17, 0x06,
+	0x74, 0x63, 0xec, 0x98, 0xe7, 0xc6, 0x17, 0x51, 0xff, 0x92, 0xf8, 0xd9, 0xdf, 0xff, 0xf5, 0xab,
+	0xc4, 0x97, 0x09, 0xf5, 0x4f, 0x09, 0x6d, 0xff, 0x46, 0xa7, 0xd7, 0x1f, 0xd4, 0xe9, 0x6b, 0x87,
+	0x91, 0xbe, 0xef, 0x48, 0x3b, 0x8c, 0x36, 0x79, 0x47, 0xda, 0x61, 0xe4, 0x72, 0x3f, 0xd2, 0x7c,
+	0xe2, 0x1a, 0x9e, 0xc1, 0xa8, 0xa7, 0x1d, 0x06, 0xb1, 0x85, 0xc3, 0x48, 0x9b, 0x70, 0xa4, 0x1d,
+	0xc6, 0x7a, 0x8b, 0xce, 0x38, 0xb2, 0x7e, 0xd2, 0x76, 0x1d, 0x69, 0x87, 0xd1, 0x9b, 0xee, 0x03,
+	0x9f, 0x79, 0xae, 0x47, 0xea, 0xd6, 0x81, 0xb6, 0x7e, 0x14, 0x2a, 0x89, 0x88, 0xf9, 0xbd, 0x3c,
+	0x7e, 0xaf, 0x22, 0xbf, 0x47, 0x20, 0x6e, 0x64, 0x7f, 0x4b, 0x71, 0xa4, 0x1d, 0x0e, 0xbb, 0x5b,
+	0x8e, 0xd0, 0x6f, 0x15, 0x80, 0x70, 0xd7, 0xc4, 0x69, 0xfa, 0x7a, 0x76, 0x6e, 0x5d, 0x6c, 0xdc,
+	0x55, 0x75, 0x6d, 0xc4, 0xb6, 0x95, 0x94, 0x75, 0xf4, 0x23, 0x48, 0x7f, 0x44, 0xe9, 0xab, 0xc0,
+	0x45, 0xf3, 0xbc, 0x8e, 0x16, 0x0b, 0xf7, 0x4c, 0x99, 0x02, 0x6f, 0xa2, 0xb9, 0x20, 0x34, 0xe7,
+	0xd1, 0x37, 0x46, 0x1e, 0x18, 0xfe, 0x0a, 0x72, 0x84, 0x7e, 0xae, 0x40, 0xfa, 0x63, 0xd7, 0x7c,
+	0xc3, 0x43, 0xbd, 0xd4, 0x77, 0x41, 0x57, 0xf8, 0xbb, 0xa1, 0x7a, 0x43, 0x58, 0xf1, 0x6e, 0xee,
+	0x94, 0x56, 0xf0, 0x30, 0xfc, 0x52, 0x81, 0xf4, 0x36, 0x69, 0x11, 0x46, 0xfa, 0xe3, 0x30, 0x4c,
+	0xcd, 0x8b, 0xe3, 0xf2, 0xbb, 0xd5, 0x6b, 0x30, 0x07, 0x50, 0x76, 0xad, 0xfb, 0xa4, 0x5d, 0x0e,
+	0x58, 0x13, 0x4d, 0xc0, 0x79, 0x48, 0x3f, 0xe4, 0x8f, 0x45, 0x34, 0x0b, 0x29, 0x8f, 0x18, 0x26,
+	0x4c, 0xbe, 0xf6, 0x2c, 0x46, 0xc2, 0xd0, 0xac, 0x9f, 0x36, 0x34, 0xff, 0x54, 0x60, 0xea, 0x0e,
+	0x61, 0x8f, 0x03, 0xe2, 0xb5, 0xff, 0x9f, 0xc1, 0xf9, 0x42, 0x39, 0x2e, 0xeb, 0xea, 0x0e, 0xac,
+	0x0e, 0x2a, 0xb6, 0x5d, 0x85, 0x63, 0x16, 0xd9, 0xe7, 0x8a, 0xf0, 0xae, 0x80, 0xae, 0x8f, 0xf2,
+	0xee, 0x33, 0x4e, 0xdf, 0xf1, 0xf1, 0xaf, 0x09, 0x48, 0x55, 0x6a, 0x4d, 0x8a, 0x4e, 0x7d, 0xb3,
+	0xe7, 0x4e, 0x8d, 0x54, 0xff, 0xad, 0x1c, 0x97, 0x3f, 0x57, 0x60, 0x86, 0xd4, 0x9a, 0x14, 0xfb,
+	0x61, 0x15, 0x85, 0x29, 0x31, 0xf2, 0xdc, 0x1a, 0x5a, 0x78, 0x12, 0xd8, 0xb6, 0xe1, 0xb5, 0x4b,
+	0xb8, 0x22, 0xa7, 0x72, 0xd9, 0x6d, 0xe2, 0xd7, 0x3c, 0x4b, 0xbc, 0xb9, 0x8b, 0x59, 0x75, 0x1b,
+	0x50, 0x3c, 0x4c, 0xc2, 0xda, 0x31, 0x83, 0x23, 0x42, 0xf3, 0xe9, 0xe8, 0xd0, 0x70, 0xd3, 0xb4,
+	0xc3, 0xb0, 0xd0, 0xec, 0xae, 0xa8, 0x59, 0x6d, 0xbf, 0xd8, 0xc5, 0xf3, 0xb5, 0x52, 0x78, 0x63,
+	0xee, 0x22, 0xd4, 0xb7, 0x84, 0x7e, 0x7d, 0x06, 0x66, 0x78, 0x8f, 0xf2, 0xc8, 0x60, 0x4d, 0x61,
+	0xe3, 0xd7, 0x53, 0x69, 0x7e, 0x97, 0x16, 0xce, 0xfd, 0x26, 0xad, 0x5e, 0x1d, 0xe1, 0xdd, 0xb7,
+	0xb9, 0x99, 0xbb, 0xb7, 0xd5, 0xf7, 0x47, 0x1e, 0xff, 0xd8, 0x77, 0x90, 0x02, 0xbf, 0x97, 0x79,
+	0x86, 0xee, 0xbe, 0x50, 0x3f, 0x89, 0x7a, 0x1d, 0x43, 0x69, 0x03, 0x7a, 0xd2, 0x5e, 0xa2, 0x01,
+	0x90, 0x42, 0x18, 0x6b, 0xce, 0xfe, 0x81, 0x7a, 0x2b, 0xca, 0xde, 0x5f, 0xe5, 0xe5, 0xee, 0x0c,
+	0x28, 0xff, 0x5c, 0xfc, 0x8e, 0xba, 0x39, 0x4c, 0x5c, 0x5a, 0xc8, 0xfd, 0x18, 0xc0, 0xd1, 0xeb,
+	0xe5, 0x67, 0x6a, 0x6b, 0x04, 0xd1, 0x20, 0x57, 0xc3, 0xdf, 0xa1, 0xec, 0x5f, 0xed, 0x7a, 0x43,
+	0xad, 0x8e, 0x50, 0x39, 0xa8, 0x61, 0x1e, 0xae, 0x6d, 0x10, 0x5a, 0x28, 0x3a, 0x52, 0x0f, 0xc6,
+	0x50, 0x14, 0x33, 0x7a, 0x94, 0x87, 0x43, 0x05, 0x23, 0x7e, 0xde, 0x56, 0xaf, 0x9c, 0x62, 0x8b,
+	0x4b, 0x03, 0x3e, 0x1a, 0x7c, 0x95, 0xa8, 0xb4, 0xaf, 0x5f, 0x54, 0x7e, 0x13, 0x2b, 0x03, 0xec,
+	0xd0, 0x4d, 0xcb, 0x31, 0x2d, 0xa7, 0xe1, 0xa3, 0x95, 0xbe, 0xa2, 0xbc, 0x2d, 0x3f, 0x58, 0x0e,
+	0xad, 0xd7, 0x13, 0xe8, 0x19, 0x9c, 0xe1, 0x2f, 0x9e, 0x34, 0x60, 0x68, 0x08, 0x68, 0xa8, 0xf0,
+	0x05, 0x91, 0x9e, 0xe7, 0xd0, 0x62, 0xd4, 0x7c, 0x26, 0xc9, 0x9a, 0x90, 0xad, 0x78, 0x1e, 0xf5,
+	0x78, 0xaf, 0xbb, 0x4d, 0x98, 0x61, 0xb5, 0xfc, 0xb1, 0x15, 0x5c, 0x15, 0x0a, 0x2e, 0xa1, 0xd5,
+	0x58, 0x45, 0xe2, 0xac, 0xaf, 0x2d, 0xd6, 0x34, 0x25, 0xeb, 0x2f, 0x14, 0x40, 0x77, 0x08, 0xeb,
+	0xed, 0xad, 0xdf, 0x1b, 0x59, 0x70, 0x7a, 0x24, 0x86, 0x9a, 0xf1, 0x4d, 0x61, 0xc6, 0x65, 0x75,
+	0x25, 0x6a, 0x06, 0xb7, 0xa0, 0x4a, 0xcd, 0xb6, 0x76, 0xc8, 0x2f, 0x79, 0xd1, 0x83, 0xa3, 0xcf,
+	0x15, 0x58, 0x78, 0x44, 0x7d, 0xc6, 0x19, 0x85, 0xa8, 0x30, 0xe4, 0x74, 0x6d, 0xfc, 0x50, 0xed,
+	0x9a, 0xd0, 0x7e, 0x8d, 0xd7, 0xc0, 0x13, 0xed, 0x2e, 0xf5, 0x19, 0xb7, 0x40, 0x7c, 0xae, 0x0e,
+	0xcd, 0xe8, 0x64, 0x79, 0xee, 0xcf, 0xca, 0x71, 0xf9, 0x4b, 0x05, 0xd5, 0x87, 0xf4, 0xfa, 0xd8,
+	0x8c, 0xdc, 0x43, 0x1b, 0x1b, 0xf8, 0x75, 0xd3, 0xaa, 0x35, 0xb1, 0xdf, 0xa4, 0x41, 0xcb, 0xc4,
+	0x0e, 0x65, 0xb8, 0x4a, 0x70, 0xe0, 0x13, 0x13, 0x5b, 0x0e, 0x76, 0x5b, 0x46, 0x8d, 0x60, 0x5a,
+	0xc7, 0xac, 0x49, 0xb0, 0x49, 0x6b, 0x81, 0x4d, 0x9c, 0xf0, 0x7b, 0x33, 0xae, 0x51, 0x9b, 0x0f,
+	0x2e, 0xe7, 0x1e, 0xc3, 0xda, 0xa0, 0xcb, 0x9e, 0xdf, 0x13, 0x9d, 0xb7, 0x8b, 0x31, 0xaf, 0xb4,
+	0xe2, 0x4b, 0x38, 0x5b, 0x33, 0x6c, 0xd2, 0xda, 0x32, 0x7c, 0x22, 0x39, 0x78, 0xd7, 0x8b, 0x74,
+	0x98, 0x14, 0x31, 0x19, 0xfb, 0x20, 0xad, 0x88, 0x18, 0x2e, 0xa2, 0x85, 0xd8, 0x41, 0xe2, 0x4b,
+	0xc5, 0x1f, 0xc0, 0x6a, 0xd9, 0xa1, 0xac, 0x49, 0x3c, 0xa9, 0x89, 0x6f, 0x5e, 0x24, 0xa9, 0xbe,
+	0x13, 0x4b, 0xb1, 0x71, 0x15, 0x4f, 0x6c, 0xfe, 0x74, 0xf2, 0xb8, 0xfc, 0x9f, 0x14, 0x62, 0xb0,
+	0x58, 0xc6, 0x9b, 0x16, 0xe3, 0xc1, 0x8c, 0x5c, 0x71, 0xcf, 0xe1, 0x6c, 0x43, 0x7f, 0xb4, 0xb5,
+	0x71, 0x27, 0xf4, 0x1c, 0xbb, 0x1e, 0x7d, 0x49, 0x6a, 0x6c, 0xdc, 0x88, 0xe5, 0xb2, 0x0e, 0x75,
+	0xc8, 0xf7, 0xa4, 0x67, 0x1c, 0x5d, 0x4c, 0xde, 0x28, 0xbc, 0xb7, 0x9e, 0x54, 0x12, 0xa9, 0x62,
+	0xd6, 0x70, 0xdd, 0x96, 0x55, 0x13, 0xdb, 0xa6, 0xbd, 0xf4, 0xa9, 0x53, 0x5c, 0x8a, 0xce, 0x1c,
+	0x6c, 0xd4, 0x29, 0xdd, 0xb0, 0x2d, 0x9b, 0x94, 0xfa, 0x90, 0xa5, 0x21, 0xc8, 0xdd, 0x2f, 0x12,
+	0x30, 0x0f, 0x99, 0x4d, 0xc3, 0xb7, 0x6a, 0xa2, 0x31, 0x4d, 0x4c, 0x29, 0x70, 0x31, 0xd6, 0xaa,
+	0xce, 0x4f, 0x25, 0x72, 0x99, 0xe7, 0x1b, 0xe5, 0x47, 0xf7, 0x36, 0xee, 0x93, 0x36, 0x4e, 0xc0,
+	0x3f, 0x94, 0x6e, 0xeb, 0xfa, 0x37, 0x65, 0x2a, 0x99, 0x4f, 0x15, 0xaf, 0x74, 0x9c, 0x8c, 0xd8,
+	0xad, 0x51, 0x23, 0x60, 0x4d, 0x8d, 0xff, 0x50, 0xcf, 0xfa, 0x21, 0x29, 0xad, 0x0d, 0x07, 0x31,
+	0xfa, 0x8a, 0x38, 0x9b, 0x3f, 0x81, 0x5c, 0xd8, 0x09, 0x23, 0x74, 0xc7, 0x33, 0x1c, 0xe6, 0x63,
+	0x3e, 0xc0, 0x46, 0xad, 0x46, 0x7c, 0x1f, 0x56, 0x65, 0x7f, 0x8c, 0x16, 0xe5, 0xa2, 0x18, 0x75,
+	0x56, 0xb7, 0x60, 0xd2, 0x30, 0x6d, 0xcb, 0x41, 0xa5, 0x98, 0xa8, 0x63, 0xc6, 0x60, 0x98, 0x51,
+	0x2c, 0x60, 0x96, 0xcf, 0x78, 0x3d, 0xdd, 0x27, 0xd8, 0x72, 0xea, 0xd4, 0xb3, 0x45, 0x58, 0xaa,
+	0x6b, 0x30, 0x1b, 0x0d, 0xc5, 0x44, 0x6f, 0xcf, 0x5e, 0xbd, 0x36, 0xb4, 0x6b, 0xef, 0x85, 0x7a,
+	0xf7, 0xe0, 0xfc, 0x83, 0x93, 0x1c, 0x8a, 0x1e, 0x8d, 0x71, 0x8f, 0xc4, 0x6e, 0xa6, 0x5b, 0x5f,
+	0xaa, 0x69, 0x71, 0x2a, 0x6f, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xff, 0x01, 0x51, 0x23, 0x61,
+	0x1b, 0x00, 0x00,
 }
diff --git a/examples/proto/examplepb/a_bit_of_everything.pb.gw.go b/examples/proto/examplepb/a_bit_of_everything.pb.gw.go
index 126bbbe39db..06564fe1717 100644
--- a/examples/proto/examplepb/a_bit_of_everything.pb.gw.go
+++ b/examples/proto/examplepb/a_bit_of_everything.pb.gw.go
@@ -205,12 +205,15 @@ func request_ABitOfEverythingService_Create_0(ctx context.Context, marshaler run
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "oneof_value_string")
 	}
 
-	if protoReq.OneofValue == nil {
-		protoReq.OneofValue = &ABitOfEverything_OneofValueString{}
-	} else if _, ok := protoReq.OneofValue.(*ABitOfEverything_OneofValueString); !ok {
-		return nil, metadata, grpc.Errorf(codes.InvalidArgument, "expect type: *ABitOfEverything_OneofValueString, but: %t\n", protoReq.OneofValue)
-	}
-	protoReq.OneofValue.(*ABitOfEverything_OneofValueString).OneofValueString, err = runtime.String(val)
+	func() *ABitOfEverything_OneofValueString {
+		msg := &protoReq
+		oneof := msg.OneofValue
+		if _, ok := oneof.(*ABitOfEverything_OneofValueString); oneof == nil || !ok {
+			oneof = new(ABitOfEverything_OneofValueString)
+			msg.OneofValue = oneof
+		}
+		return oneof.(*ABitOfEverything_OneofValueString)
+	}().OneofValueString, err = runtime.String(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "oneof_value_string", err)
@@ -525,12 +528,15 @@ func request_ABitOfEverythingService_DeepPathEcho_3(ctx context.Context, marshal
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "oneof_value_string")
 	}
 
-	if protoReq.OneofValue == nil {
-		protoReq.OneofValue = &ABitOfEverything_OneofValueString{}
-	} else if _, ok := protoReq.OneofValue.(*ABitOfEverything_OneofValueString); !ok {
-		return nil, metadata, grpc.Errorf(codes.InvalidArgument, "expect type: *ABitOfEverything_OneofValueString, but: %t\n", protoReq.OneofValue)
-	}
-	protoReq.OneofValue.(*ABitOfEverything_OneofValueString).OneofValueString, err = runtime.String(val)
+	func() *ABitOfEverything_OneofValueString {
+		msg := &protoReq
+		oneof := msg.OneofValue
+		if _, ok := oneof.(*ABitOfEverything_OneofValueString); oneof == nil || !ok {
+			oneof = new(ABitOfEverything_OneofValueString)
+			msg.OneofValue = oneof
+		}
+		return oneof.(*ABitOfEverything_OneofValueString)
+	}().OneofValueString, err = runtime.String(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "oneof_value_string", err)
@@ -665,6 +671,64 @@ func request_ABitOfEverythingService_DeepPathEcho_7(ctx context.Context, marshal
 
 }
 
+var (
+	filter_ABitOfEverythingService_DeepPathEcho_8 = &utilities.DoubleArray{Encoding: map[string]int{"oneof_value_string": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
+)
+
+func request_ABitOfEverythingService_DeepPathEcho_8(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq ABitOfEverything
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&func() *ABitOfEverything_OneofValueString {
+		msg := &protoReq
+		oneof := msg.OneofValue
+		if _, ok := oneof.(*ABitOfEverything_OneofValueString); oneof == nil || !ok {
+			oneof = new(ABitOfEverything_OneofValueString)
+			msg.OneofValue = oneof
+		}
+		return oneof.(*ABitOfEverything_OneofValueString)
+	}().OneofValueString); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_ABitOfEverythingService_DeepPathEcho_8); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := client.DeepPathEcho(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+var (
+	filter_ABitOfEverythingService_DeepPathEcho_9 = &utilities.DoubleArray{Encoding: map[string]int{"oneof_value_nested": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
+)
+
+func request_ABitOfEverythingService_DeepPathEcho_9(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq ABitOfEverything
+	var metadata runtime.ServerMetadata
+
+	if err := marshaler.NewDecoder(req.Body).Decode(&func() *ABitOfEverything_OneofValueNested {
+		msg := &protoReq
+		oneof := msg.OneofValue
+		if _, ok := oneof.(*ABitOfEverything_OneofValueNested); oneof == nil || !ok {
+			oneof = new(ABitOfEverything_OneofValueNested)
+			msg.OneofValue = oneof
+		}
+		return oneof.(*ABitOfEverything_OneofValueNested)
+	}().OneofValueNested); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_ABitOfEverythingService_DeepPathEcho_9); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := client.DeepPathEcho(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
 func request_ABitOfEverythingService_Timeout_0(ctx context.Context, marshaler runtime.Marshaler, client ABitOfEverythingServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq empty.Empty
 	var metadata runtime.ServerMetadata
@@ -1285,6 +1349,64 @@ func RegisterABitOfEverythingServiceHandlerClient(ctx context.Context, mux *runt
 
 	})
 
+	mux.Handle("POST", pattern_ABitOfEverythingService_DeepPathEcho_8, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		if cn, ok := w.(http.CloseNotifier); ok {
+			go func(done <-chan struct{}, closed <-chan bool) {
+				select {
+				case <-done:
+				case <-closed:
+					cancel()
+				}
+			}(ctx.Done(), cn.CloseNotify())
+		}
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ABitOfEverythingService_DeepPathEcho_8(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ABitOfEverythingService_DeepPathEcho_8(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
+	mux.Handle("POST", pattern_ABitOfEverythingService_DeepPathEcho_9, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		if cn, ok := w.(http.CloseNotifier); ok {
+			go func(done <-chan struct{}, closed <-chan bool) {
+				select {
+				case <-done:
+				case <-closed:
+					cancel()
+				}
+			}(ctx.Done(), cn.CloseNotify())
+		}
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_ABitOfEverythingService_DeepPathEcho_9(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_ABitOfEverythingService_DeepPathEcho_9(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	mux.Handle("GET", pattern_ABitOfEverythingService_Timeout_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -1439,6 +1561,10 @@ var (
 
 	pattern_ABitOfEverythingService_DeepPathEcho_7 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5, 1, 0, 4, 1, 5, 6}, []string{"v2", "example", "oneof_value_nested", "oneof_value_deeper_nested", "value", "echo", "oneof_value_nested.oneof_value_deeper_nested.value"}, ""))
 
+	pattern_ABitOfEverythingService_DeepPathEcho_8 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"v2", "example", "oneof_value_string", "echo"}, ""))
+
+	pattern_ABitOfEverythingService_DeepPathEcho_9 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"v2", "example", "oneof_value_nested", "echo"}, ""))
+
 	pattern_ABitOfEverythingService_Timeout_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "example", "timeout"}, ""))
 
 	pattern_ABitOfEverythingService_ErrorWithDetails_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "example", "errorwithdetails"}, ""))
@@ -1483,6 +1609,10 @@ var (
 
 	forward_ABitOfEverythingService_DeepPathEcho_7 = runtime.ForwardResponseMessage
 
+	forward_ABitOfEverythingService_DeepPathEcho_8 = runtime.ForwardResponseMessage
+
+	forward_ABitOfEverythingService_DeepPathEcho_9 = runtime.ForwardResponseMessage
+
 	forward_ABitOfEverythingService_Timeout_0 = runtime.ForwardResponseMessage
 
 	forward_ABitOfEverythingService_ErrorWithDetails_0 = runtime.ForwardResponseMessage
diff --git a/examples/proto/examplepb/a_bit_of_everything.proto b/examples/proto/examplepb/a_bit_of_everything.proto
index e6d495595c5..b22b2c9a8db 100644
--- a/examples/proto/examplepb/a_bit_of_everything.proto
+++ b/examples/proto/examplepb/a_bit_of_everything.proto
@@ -336,6 +336,17 @@ service ABitOfEverythingService {
 				post: "/v2/example/oneof_value_nested/oneof_value_deeper_nested/value/echo/{oneof_value_nested.oneof_value_deeper_nested.value}"
 				body: "*"
 			}
+			
+			additional_bindings {
+				post: "/v2/example/oneof_value_string/echo"
+				// a oneof option in body
+				body: "oneof_value_string"
+			}
+			additional_bindings {
+				post: "/v2/example/oneof_value_nested/echo"
+				// a oneof option in body
+				body: "oneof_value_nested"
+			}
 		};
 	}
 	rpc NoBindings(google.protobuf.Duration) returns (google.protobuf.Empty) {}
diff --git a/examples/proto/examplepb/a_bit_of_everything.swagger.json b/examples/proto/examplepb/a_bit_of_everything.swagger.json
index f949ca37532..7a797bdeeca 100644
--- a/examples/proto/examplepb/a_bit_of_everything.swagger.json
+++ b/examples/proto/examplepb/a_bit_of_everything.swagger.json
@@ -742,6 +742,32 @@
         ]
       }
     },
+    "/v2/example/oneof_value_nested/echo": {
+      "post": {
+        "operationId": "DeepPathEcho10",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ABitOfEverythingNested"
+            }
+          }
+        ],
+        "tags": [
+          "ABitOfEverythingService"
+        ]
+      }
+    },
     "/v2/example/oneof_value_nested/name/echo/{oneof_value_nested.name}": {
       "post": {
         "operationId": "DeepPathEcho5",
@@ -838,6 +864,32 @@
         ]
       }
     },
+    "/v2/example/oneof_value_string/echo": {
+      "post": {
+        "operationId": "DeepPathEcho9",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/examplepbABitOfEverything"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "tags": [
+          "ABitOfEverythingService"
+        ]
+      }
+    },
     "/v2/example/oneof_value_string/echo/{oneof_value_string}": {
       "post": {
         "operationId": "DeepPathEcho4",
diff --git a/examples/proto/examplepb/echo_service.pb.gw.go b/examples/proto/examplepb/echo_service.pb.gw.go
index 844ef1418ad..d4f17ec99e5 100644
--- a/examples/proto/examplepb/echo_service.pb.gw.go
+++ b/examples/proto/examplepb/echo_service.pb.gw.go
@@ -151,12 +151,15 @@ func request_EchoService_Echo_2(ctx context.Context, marshaler runtime.Marshaler
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "lang")
 	}
 
-	if protoReq.Code == nil {
-		protoReq.Code = &SimpleMessage_Lang{}
-	} else if _, ok := protoReq.Code.(*SimpleMessage_Lang); !ok {
-		return nil, metadata, grpc.Errorf(codes.InvalidArgument, "expect type: *SimpleMessage_Lang, but: %t\n", protoReq.Code)
-	}
-	protoReq.Code.(*SimpleMessage_Lang).Lang, err = runtime.String(val)
+	func() *SimpleMessage_Lang {
+		msg := &protoReq
+		oneof := msg.Code
+		if _, ok := oneof.(*SimpleMessage_Lang); oneof == nil || !ok {
+			oneof = new(SimpleMessage_Lang)
+			msg.Code = oneof
+		}
+		return oneof.(*SimpleMessage_Lang)
+	}().Lang, err = runtime.String(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "lang", err)
@@ -202,12 +205,15 @@ func request_EchoService_Echo_3(ctx context.Context, marshaler runtime.Marshaler
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "line_num")
 	}
 
-	if protoReq.Code == nil {
-		protoReq.Code = &SimpleMessage_LineNum{}
-	} else if _, ok := protoReq.Code.(*SimpleMessage_LineNum); !ok {
-		return nil, metadata, grpc.Errorf(codes.InvalidArgument, "expect type: *SimpleMessage_LineNum, but: %t\n", protoReq.Code)
-	}
-	protoReq.Code.(*SimpleMessage_LineNum).LineNum, err = runtime.Int64(val)
+	func() *SimpleMessage_LineNum {
+		msg := &protoReq
+		oneof := msg.Code
+		if _, ok := oneof.(*SimpleMessage_LineNum); oneof == nil || !ok {
+			oneof = new(SimpleMessage_LineNum)
+			msg.Code = oneof
+		}
+		return oneof.(*SimpleMessage_LineNum)
+	}().LineNum, err = runtime.Int64(val)
 
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "line_num", err)
diff --git a/protoc-gen-grpc-gateway/descriptor/types.go b/protoc-gen-grpc-gateway/descriptor/types.go
index 6346b68e956..c489adfc301 100644
--- a/protoc-gen-grpc-gateway/descriptor/types.go
+++ b/protoc-gen-grpc-gateway/descriptor/types.go
@@ -1,8 +1,10 @@
 package descriptor
 
 import (
+	"bytes"
 	"fmt"
 	"strings"
+	"text/template"
 
 	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
 	gogen "github.com/golang/protobuf/protoc-gen-go/generator"
@@ -260,6 +262,29 @@ func (p FieldPath) IsNestedProto3() bool {
 	return false
 }
 
+type oneofParams struct {
+	// MsgExpr is the the expresson for the message which the oneof field belongs to.
+	MsgExpr string
+	// OneofName is the name of the oneof field in the message
+	OneofName string
+	// ConcreteType is the type name of the concrete struct which implements the isXXX interface
+	ConcreteType string
+}
+
+var (
+	oneofTemplate = template.Must(template.New("oneof").Parse(`
+		func() *{{.ConcreteType}} {
+			msg := &{{.MsgExpr}}
+			oneof := msg.{{.OneofName}}
+			if _, ok := oneof.(*{{.ConcreteType}}); oneof == nil || !ok {
+				oneof = new({{.ConcreteType}})
+				msg.{{.OneofName}} = oneof
+			}
+			return oneof.(*{{.ConcreteType}})
+		}()`,
+	))
+)
+
 // AssignableExpr is an assignable expression in Go to be used to assign a value to the target field.
 // It starts with "msgExpr", which is the go expression of the method request object.
 func (p FieldPath) AssignableExpr(msgExpr string) string {
@@ -268,36 +293,37 @@ func (p FieldPath) AssignableExpr(msgExpr string) string {
 		return msgExpr
 	}
 
-	var preparations []string
-	components := msgExpr
+	components := []string{msgExpr}
 	for i, c := range p {
 		// Check if it is a oneOf field.
 		if c.Target.OneofIndex != nil {
-			index := c.Target.OneofIndex
-			msg := c.Target.Message
-			oneOfName := gogen.CamelCase(msg.GetOneofDecl()[*index].GetName())
-			oneofFieldName := msg.GetName() + "_" + c.AssignableExpr()
-
-			components = components + "." + oneOfName
-			s := `if %s == nil {
-				%s =&%s{}
-			} else if _, ok := %s.(*%s); !ok {
-				return nil, metadata, grpc.Errorf(codes.InvalidArgument, "expect type: *%s, but: %%t\n",%s)
-			}`
-
-			preparations = append(preparations, fmt.Sprintf(s, components, components, oneofFieldName, components, oneofFieldName, oneofFieldName, components))
-			components = components + ".(*" + oneofFieldName + ")"
+			var (
+				index = c.Target.OneofIndex
+				msg   = c.Target.Message
+				buf   bytes.Buffer
+			)
+			// TODO(yugui) Use the package which the caller tempalte is dealing with.
+			// it will be necessary to correctly deal with oneof fields in messges in another packages than the service.
+			err := oneofTemplate.Execute(&buf, &oneofParams{
+				MsgExpr:   strings.Join(components, "."),
+				OneofName: gogen.CamelCase(msg.GetOneofDecl()[*index].GetName()),
+				//ConcreteType: msg.GetName() + "_" + c.AssignableExpr(),
+				ConcreteType: msg.GoType(msg.File.GoPkg.Path) + "_" + c.AssignableExpr(),
+			})
+			if err != nil {
+				panic(fmt.Sprintf("cannot apply oneofTemplate: %v", err))
+			}
+			components = []string{buf.String()}
 		}
 
 		if i == l-1 {
-			components = components + "." + c.AssignableExpr()
+			components = append(components, c.AssignableExpr())
 			continue
 		}
-		components = components + "." + c.ValueExpr()
+		components = append(components, c.ValueExpr())
 	}
 
-	preparations = append(preparations, components)
-	return strings.Join(preparations, "\n")
+	return strings.Join(components, ".")
 }
 
 // FieldPathComponent is a path component in FieldPath

From 348191b4d14880cf513f30de2356103969009029 Mon Sep 17 00:00:00 2001
From: Yuki Yugui Sonoda <yugui@yugui.jp>
Date: Mon, 30 Apr 2018 20:59:11 +0900
Subject: [PATCH 5/7] Merge tests for oneof fields in echo_service to abe

To let the TestEcho focus on the fundamental functionalities.
---
 Makefile                                      |   3 +-
 examples/clients/echo/BUILD.bazel             |   1 -
 examples/clients/echo/echo_service_api.go     | 259 +------------
 examples/clients/echo/examplepb_embedded.go   |  19 -
 .../clients/echo/examplepb_simple_message.go  |  10 -
 examples/integration/integration_test.go      | 102 -----
 examples/proto/examplepb/echo_service.pb.go   | 359 +-----------------
 .../proto/examplepb/echo_service.pb.gw.go     | 272 -------------
 examples/proto/examplepb/echo_service.proto   |  26 --
 .../proto/examplepb/echo_service.swagger.json | 348 -----------------
 10 files changed, 23 insertions(+), 1376 deletions(-)
 delete mode 100644 examples/clients/echo/examplepb_embedded.go

diff --git a/Makefile b/Makefile
index 890f7ede3fd..5242bcca3e0 100644
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,7 @@ ECHO_EXAMPLE_SRCS=$(EXAMPLE_CLIENT_DIR)/echo/api_client.go \
 		  $(EXAMPLE_CLIENT_DIR)/echo/api_response.go \
 		  $(EXAMPLE_CLIENT_DIR)/echo/configuration.go \
 		  $(EXAMPLE_CLIENT_DIR)/echo/echo_service_api.go \
-		  $(EXAMPLE_CLIENT_DIR)/echo/examplepb_simple_message.go \
-		  $(EXAMPLE_CLIENT_DIR)/echo/examplepb_embedded.go
+		  $(EXAMPLE_CLIENT_DIR)/echo/examplepb_simple_message.go
 ABE_EXAMPLE_SPEC=examples/proto/examplepb/a_bit_of_everything.swagger.json
 ABE_EXAMPLE_SRCS=$(EXAMPLE_CLIENT_DIR)/abe/a_bit_of_everything_nested.go \
 		 $(EXAMPLE_CLIENT_DIR)/abe/a_bit_of_everything_service_api.go \
diff --git a/examples/clients/echo/BUILD.bazel b/examples/clients/echo/BUILD.bazel
index 090b56aafab..99243f3cded 100644
--- a/examples/clients/echo/BUILD.bazel
+++ b/examples/clients/echo/BUILD.bazel
@@ -9,7 +9,6 @@ go_library(
         "api_response.go",
         "configuration.go",
         "echo_service_api.go",
-        "examplepb_embedded.go",
         "examplepb_simple_message.go",
     ],
     importpath = "github.com/grpc-ecosystem/grpc-gateway/examples/clients/echo",
diff --git a/examples/clients/echo/echo_service_api.go b/examples/clients/echo/echo_service_api.go
index 775d0b3a7e6..41316dce169 100644
--- a/examples/clients/echo/echo_service_api.go
+++ b/examples/clients/echo/echo_service_api.go
@@ -104,16 +104,9 @@ func (a EchoServiceApi) Echo(id string) (*ExamplepbSimpleMessage, *APIResponse,
  *
  * @param id 
  * @param num 
- * @param lineNum 
- * @param lang 
- * @param statusProgress 
- * @param statusNote 
- * @param en 
- * @param noProgress 
- * @param noNote 
  * @return *ExamplepbSimpleMessage
  */
-func (a EchoServiceApi) Echo2(id string, num string, lineNum string, lang string, statusProgress string, statusNote string, en string, noProgress string, noNote string) (*ExamplepbSimpleMessage, *APIResponse, error) {
+func (a EchoServiceApi) Echo2(id string, num string) (*ExamplepbSimpleMessage, *APIResponse, error) {
 
 	var localVarHttpMethod = strings.ToUpper("Get")
 	// create path and map variables
@@ -131,13 +124,6 @@ func (a EchoServiceApi) Echo2(id string, num string, lineNum string, lang string
 	for key := range a.Configuration.DefaultHeader {
 		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
 	}
-	localVarQueryParams.Add("line_num", a.Configuration.APIClient.ParameterToString(lineNum, ""))
-	localVarQueryParams.Add("lang", a.Configuration.APIClient.ParameterToString(lang, ""))
-	localVarQueryParams.Add("status.progress", a.Configuration.APIClient.ParameterToString(statusProgress, ""))
-	localVarQueryParams.Add("status.note", a.Configuration.APIClient.ParameterToString(statusNote, ""))
-	localVarQueryParams.Add("en", a.Configuration.APIClient.ParameterToString(en, ""))
-	localVarQueryParams.Add("no.progress", a.Configuration.APIClient.ParameterToString(noProgress, ""))
-	localVarQueryParams.Add("no.note", a.Configuration.APIClient.ParameterToString(noNote, ""))
 
 	// to determine the Content-Type header
 	localVarHttpContentTypes := []string{ "application/json",  }
@@ -175,233 +161,6 @@ func (a EchoServiceApi) Echo2(id string, num string, lineNum string, lang string
 	return successPayload, localVarAPIResponse, err
 }
 
-/**
- * Echo method receives a simple message and returns it.
- * The message posted as the id parameter will also be returned.
- *
- * @param id 
- * @param num 
- * @param lang 
- * @param lineNum 
- * @param statusProgress 
- * @param statusNote 
- * @param en 
- * @param noProgress 
- * @param noNote 
- * @return *ExamplepbSimpleMessage
- */
-func (a EchoServiceApi) Echo3(id string, num string, lang string, lineNum string, statusProgress string, statusNote string, en string, noProgress string, noNote string) (*ExamplepbSimpleMessage, *APIResponse, error) {
-
-	var localVarHttpMethod = strings.ToUpper("Get")
-	// create path and map variables
-	localVarPath := a.Configuration.BasePath + "/v1/example/echo/{id}/{num}/{lang}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", fmt.Sprintf("%v", id), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"num"+"}", fmt.Sprintf("%v", num), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"lang"+"}", fmt.Sprintf("%v", lang), -1)
-
-	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := make(map[string]string)
-	var localVarPostBody interface{}
-	var localVarFileName string
-	var localVarFileBytes []byte
-	// add default headers if any
-	for key := range a.Configuration.DefaultHeader {
-		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
-	}
-	localVarQueryParams.Add("line_num", a.Configuration.APIClient.ParameterToString(lineNum, ""))
-	localVarQueryParams.Add("status.progress", a.Configuration.APIClient.ParameterToString(statusProgress, ""))
-	localVarQueryParams.Add("status.note", a.Configuration.APIClient.ParameterToString(statusNote, ""))
-	localVarQueryParams.Add("en", a.Configuration.APIClient.ParameterToString(en, ""))
-	localVarQueryParams.Add("no.progress", a.Configuration.APIClient.ParameterToString(noProgress, ""))
-	localVarQueryParams.Add("no.note", a.Configuration.APIClient.ParameterToString(noNote, ""))
-
-	// to determine the Content-Type header
-	localVarHttpContentTypes := []string{ "application/json",  }
-
-	// set Content-Type header
-	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
-	if localVarHttpContentType != "" {
-		localVarHeaderParams["Content-Type"] = localVarHttpContentType
-	}
-	// to determine the Accept header
-	localVarHttpHeaderAccepts := []string{
-		"application/json",
-		}
-
-	// set Accept header
-	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
-	if localVarHttpHeaderAccept != "" {
-		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
-	}
-	var successPayload = new(ExamplepbSimpleMessage)
-	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
-
-	var localVarURL, _ = url.Parse(localVarPath)
-	localVarURL.RawQuery = localVarQueryParams.Encode()
-	var localVarAPIResponse = &APIResponse{Operation: "Echo3", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
-	if localVarHttpResponse != nil {
-		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
-		localVarAPIResponse.Payload = localVarHttpResponse.Body()
-	}
-
-	if err != nil {
-		return successPayload, localVarAPIResponse, err
-	}
-	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
-	return successPayload, localVarAPIResponse, err
-}
-
-/**
- * Echo method receives a simple message and returns it.
- * The message posted as the id parameter will also be returned.
- *
- * @param id 
- * @param lineNum 
- * @param statusNote 
- * @param num 
- * @param lang 
- * @param statusProgress 
- * @param en 
- * @param noProgress 
- * @return *ExamplepbSimpleMessage
- */
-func (a EchoServiceApi) Echo4(id string, lineNum string, statusNote string, num string, lang string, statusProgress string, en string, noProgress string) (*ExamplepbSimpleMessage, *APIResponse, error) {
-
-	var localVarHttpMethod = strings.ToUpper("Get")
-	// create path and map variables
-	localVarPath := a.Configuration.BasePath + "/v1/example/echo1/{id}/{line_num}/{status.note}"
-	localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", fmt.Sprintf("%v", id), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"line_num"+"}", fmt.Sprintf("%v", lineNum), -1)
-	localVarPath = strings.Replace(localVarPath, "{"+"status.note"+"}", fmt.Sprintf("%v", statusNote), -1)
-
-	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := make(map[string]string)
-	var localVarPostBody interface{}
-	var localVarFileName string
-	var localVarFileBytes []byte
-	// add default headers if any
-	for key := range a.Configuration.DefaultHeader {
-		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
-	}
-	localVarQueryParams.Add("num", a.Configuration.APIClient.ParameterToString(num, ""))
-	localVarQueryParams.Add("lang", a.Configuration.APIClient.ParameterToString(lang, ""))
-	localVarQueryParams.Add("status.progress", a.Configuration.APIClient.ParameterToString(statusProgress, ""))
-	localVarQueryParams.Add("en", a.Configuration.APIClient.ParameterToString(en, ""))
-	localVarQueryParams.Add("no.progress", a.Configuration.APIClient.ParameterToString(noProgress, ""))
-
-	// to determine the Content-Type header
-	localVarHttpContentTypes := []string{ "application/json",  }
-
-	// set Content-Type header
-	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
-	if localVarHttpContentType != "" {
-		localVarHeaderParams["Content-Type"] = localVarHttpContentType
-	}
-	// to determine the Accept header
-	localVarHttpHeaderAccepts := []string{
-		"application/json",
-		}
-
-	// set Accept header
-	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
-	if localVarHttpHeaderAccept != "" {
-		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
-	}
-	var successPayload = new(ExamplepbSimpleMessage)
-	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
-
-	var localVarURL, _ = url.Parse(localVarPath)
-	localVarURL.RawQuery = localVarQueryParams.Encode()
-	var localVarAPIResponse = &APIResponse{Operation: "Echo4", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
-	if localVarHttpResponse != nil {
-		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
-		localVarAPIResponse.Payload = localVarHttpResponse.Body()
-	}
-
-	if err != nil {
-		return successPayload, localVarAPIResponse, err
-	}
-	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
-	return successPayload, localVarAPIResponse, err
-}
-
-/**
- * Echo method receives a simple message and returns it.
- * The message posted as the id parameter will also be returned.
- *
- * @param noNote 
- * @param id Id represents the message identifier.
- * @param num 
- * @param lineNum 
- * @param lang 
- * @param statusProgress 
- * @param en 
- * @param noProgress 
- * @return *ExamplepbSimpleMessage
- */
-func (a EchoServiceApi) Echo5(noNote string, id string, num string, lineNum string, lang string, statusProgress string, en string, noProgress string) (*ExamplepbSimpleMessage, *APIResponse, error) {
-
-	var localVarHttpMethod = strings.ToUpper("Get")
-	// create path and map variables
-	localVarPath := a.Configuration.BasePath + "/v1/example/echo2/{no.note}"
-	localVarPath = strings.Replace(localVarPath, "{"+"no.note"+"}", fmt.Sprintf("%v", noNote), -1)
-
-	localVarHeaderParams := make(map[string]string)
-	localVarQueryParams := url.Values{}
-	localVarFormParams := make(map[string]string)
-	var localVarPostBody interface{}
-	var localVarFileName string
-	var localVarFileBytes []byte
-	// add default headers if any
-	for key := range a.Configuration.DefaultHeader {
-		localVarHeaderParams[key] = a.Configuration.DefaultHeader[key]
-	}
-	localVarQueryParams.Add("id", a.Configuration.APIClient.ParameterToString(id, ""))
-	localVarQueryParams.Add("num", a.Configuration.APIClient.ParameterToString(num, ""))
-	localVarQueryParams.Add("line_num", a.Configuration.APIClient.ParameterToString(lineNum, ""))
-	localVarQueryParams.Add("lang", a.Configuration.APIClient.ParameterToString(lang, ""))
-	localVarQueryParams.Add("status.progress", a.Configuration.APIClient.ParameterToString(statusProgress, ""))
-	localVarQueryParams.Add("en", a.Configuration.APIClient.ParameterToString(en, ""))
-	localVarQueryParams.Add("no.progress", a.Configuration.APIClient.ParameterToString(noProgress, ""))
-
-	// to determine the Content-Type header
-	localVarHttpContentTypes := []string{ "application/json",  }
-
-	// set Content-Type header
-	localVarHttpContentType := a.Configuration.APIClient.SelectHeaderContentType(localVarHttpContentTypes)
-	if localVarHttpContentType != "" {
-		localVarHeaderParams["Content-Type"] = localVarHttpContentType
-	}
-	// to determine the Accept header
-	localVarHttpHeaderAccepts := []string{
-		"application/json",
-		}
-
-	// set Accept header
-	localVarHttpHeaderAccept := a.Configuration.APIClient.SelectHeaderAccept(localVarHttpHeaderAccepts)
-	if localVarHttpHeaderAccept != "" {
-		localVarHeaderParams["Accept"] = localVarHttpHeaderAccept
-	}
-	var successPayload = new(ExamplepbSimpleMessage)
-	localVarHttpResponse, err := a.Configuration.APIClient.CallAPI(localVarPath, localVarHttpMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFileName, localVarFileBytes)
-
-	var localVarURL, _ = url.Parse(localVarPath)
-	localVarURL.RawQuery = localVarQueryParams.Encode()
-	var localVarAPIResponse = &APIResponse{Operation: "Echo5", Method: localVarHttpMethod, RequestURL: localVarURL.String()}
-	if localVarHttpResponse != nil {
-		localVarAPIResponse.Response = localVarHttpResponse.RawResponse
-		localVarAPIResponse.Payload = localVarHttpResponse.Body()
-	}
-
-	if err != nil {
-		return successPayload, localVarAPIResponse, err
-	}
-	err = json.Unmarshal(localVarHttpResponse.Body(), &successPayload)
-	return successPayload, localVarAPIResponse, err
-}
-
 /**
  * EchoBody method receives a simple message and returns it.
  *
@@ -468,16 +227,9 @@ func (a EchoServiceApi) EchoBody(body ExamplepbSimpleMessage) (*ExamplepbSimpleM
  *
  * @param id Id represents the message identifier.
  * @param num 
- * @param lineNum 
- * @param lang 
- * @param statusProgress 
- * @param statusNote 
- * @param en 
- * @param noProgress 
- * @param noNote 
  * @return *ExamplepbSimpleMessage
  */
-func (a EchoServiceApi) EchoDelete(id string, num string, lineNum string, lang string, statusProgress string, statusNote string, en string, noProgress string, noNote string) (*ExamplepbSimpleMessage, *APIResponse, error) {
+func (a EchoServiceApi) EchoDelete(id string, num string) (*ExamplepbSimpleMessage, *APIResponse, error) {
 
 	var localVarHttpMethod = strings.ToUpper("Delete")
 	// create path and map variables
@@ -495,13 +247,6 @@ func (a EchoServiceApi) EchoDelete(id string, num string, lineNum string, lang s
 	}
 	localVarQueryParams.Add("id", a.Configuration.APIClient.ParameterToString(id, ""))
 	localVarQueryParams.Add("num", a.Configuration.APIClient.ParameterToString(num, ""))
-	localVarQueryParams.Add("line_num", a.Configuration.APIClient.ParameterToString(lineNum, ""))
-	localVarQueryParams.Add("lang", a.Configuration.APIClient.ParameterToString(lang, ""))
-	localVarQueryParams.Add("status.progress", a.Configuration.APIClient.ParameterToString(statusProgress, ""))
-	localVarQueryParams.Add("status.note", a.Configuration.APIClient.ParameterToString(statusNote, ""))
-	localVarQueryParams.Add("en", a.Configuration.APIClient.ParameterToString(en, ""))
-	localVarQueryParams.Add("no.progress", a.Configuration.APIClient.ParameterToString(noProgress, ""))
-	localVarQueryParams.Add("no.note", a.Configuration.APIClient.ParameterToString(noNote, ""))
 
 	// to determine the Content-Type header
 	localVarHttpContentTypes := []string{ "application/json",  }
diff --git a/examples/clients/echo/examplepb_embedded.go b/examples/clients/echo/examplepb_embedded.go
deleted file mode 100644
index 4b5fe265ac9..00000000000
--- a/examples/clients/echo/examplepb_embedded.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 
- * Echo Service
- *
- * Echo Service API consists of a single service which returns a message.
- *
- * OpenAPI spec version: version not set
- * 
- * Generated by: https://github.com/swagger-api/swagger-codegen.git
- */
-
-package echo
-
-// Embedded represents a message embedded in SimpleMessage.
-type ExamplepbEmbedded struct {
-
-	Progress string `json:"progress,omitempty"`
-
-	Note string `json:"note,omitempty"`
-}
diff --git a/examples/clients/echo/examplepb_simple_message.go b/examples/clients/echo/examplepb_simple_message.go
index 366a6876665..98eb8325083 100644
--- a/examples/clients/echo/examplepb_simple_message.go
+++ b/examples/clients/echo/examplepb_simple_message.go
@@ -17,14 +17,4 @@ type ExamplepbSimpleMessage struct {
 	Id string `json:"id,omitempty"`
 
 	Num string `json:"num,omitempty"`
-
-	LineNum string `json:"line_num,omitempty"`
-
-	Lang string `json:"lang,omitempty"`
-
-	Status ExamplepbEmbedded `json:"status,omitempty"`
-
-	En string `json:"en,omitempty"`
-
-	No ExamplepbEmbedded `json:"no,omitempty"`
 }
diff --git a/examples/integration/integration_test.go b/examples/integration/integration_test.go
index 0df7587335d..e178b328e16 100644
--- a/examples/integration/integration_test.go
+++ b/examples/integration/integration_test.go
@@ -38,9 +38,6 @@ func TestEcho(t *testing.T) {
 	}
 
 	testEcho(t, 8080, "application/json")
-	testEchoOneof(t, 8080, "application/json")
-	testEchoOneof1(t, 8080, "application/json")
-	testEchoOneof2(t, 8080, "application/json")
 	testEchoBody(t, 8080)
 }
 
@@ -104,105 +101,6 @@ func testEcho(t *testing.T, port int, contentType string) {
 	}
 }
 
-func testEchoOneof(t *testing.T, port int, contentType string) {
-	url := fmt.Sprintf("http://localhost:%d/v1/example/echo/myid/10/golang", port)
-	resp, err := http.Get(url)
-	if err != nil {
-		t.Errorf("http.Get(%q) failed with %v; want success", url, err)
-		return
-	}
-	defer resp.Body.Close()
-	buf, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		t.Errorf("iotuil.ReadAll(resp.Body) failed with %v; want success", err)
-		return
-	}
-
-	if got, want := resp.StatusCode, http.StatusOK; got != want {
-		t.Errorf("resp.StatusCode = %d; want %d", got, want)
-		t.Logf("%s", buf)
-	}
-
-	var msg gw.SimpleMessage
-	if err := jsonpb.UnmarshalString(string(buf), &msg); err != nil {
-		t.Errorf("jsonpb.UnmarshalString(%s, &msg) failed with %v; want success", buf, err)
-		return
-	}
-	if got, want := msg.GetLang(), "golang"; got != want {
-		t.Errorf("msg.GetLang() = %q; want %q", got, want)
-	}
-
-	if value := resp.Header.Get("Content-Type"); value != contentType {
-		t.Errorf("Content-Type was %s, wanted %s", value, contentType)
-	}
-}
-
-func testEchoOneof1(t *testing.T, port int, contentType string) {
-	url := fmt.Sprintf("http://localhost:%d/v1/example/echo1/myid/10/golang", port)
-	resp, err := http.Get(url)
-	if err != nil {
-		t.Errorf("http.Get(%q) failed with %v; want success", url, err)
-		return
-	}
-	defer resp.Body.Close()
-	buf, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		t.Errorf("iotuil.ReadAll(resp.Body) failed with %v; want success", err)
-		return
-	}
-
-	if got, want := resp.StatusCode, http.StatusOK; got != want {
-		t.Errorf("resp.StatusCode = %d; want %d", got, want)
-		t.Logf("%s", buf)
-	}
-
-	var msg gw.SimpleMessage
-	if err := jsonpb.UnmarshalString(string(buf), &msg); err != nil {
-		t.Errorf("jsonpb.UnmarshalString(%s, &msg) failed with %v; want success", buf, err)
-		return
-	}
-	if got, want := msg.GetStatus().GetNote(), "golang"; got != want {
-		t.Errorf("msg.GetStatus().GetNote() = %q; want %q", got, want)
-	}
-
-	if value := resp.Header.Get("Content-Type"); value != contentType {
-		t.Errorf("Content-Type was %s, wanted %s", value, contentType)
-	}
-}
-
-func testEchoOneof2(t *testing.T, port int, contentType string) {
-	url := fmt.Sprintf("http://localhost:%d/v1/example/echo2/golang", port)
-	resp, err := http.Get(url)
-	if err != nil {
-		t.Errorf("http.Get(%q) failed with %v; want success", url, err)
-		return
-	}
-	defer resp.Body.Close()
-	buf, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		t.Errorf("iotuil.ReadAll(resp.Body) failed with %v; want success", err)
-		return
-	}
-
-	if got, want := resp.StatusCode, http.StatusOK; got != want {
-		t.Errorf("resp.StatusCode = %d; want %d", got, want)
-		t.Logf("%s", buf)
-	}
-
-	var msg gw.SimpleMessage
-	if err := jsonpb.UnmarshalString(string(buf), &msg); err != nil {
-		t.Errorf("jsonpb.UnmarshalString(%s, &msg) failed with %v; want success", buf, err)
-		return
-	}
-	if got, want := msg.GetNo().GetNote(), "golang"; got != want {
-		t.Errorf("msg.GetNo().GetNote() = %q; want %q", got, want)
-	}
-
-	if value := resp.Header.Get("Content-Type"); value != contentType {
-		t.Errorf("Content-Type was %s, wanted %s", value, contentType)
-	}
-}
-
 // testEchoBody is a part of TestEcho which deals with a body parameter.
 func testEchoBody(t *testing.T, port int) {
 	sent := gw.SimpleMessage{Id: "example"}
diff --git a/examples/proto/examplepb/echo_service.pb.go b/examples/proto/examplepb/echo_service.pb.go
index f200e4881ac..2e61c94ed01 100644
--- a/examples/proto/examplepb/echo_service.pb.go
+++ b/examples/proto/examplepb/echo_service.pb.go
@@ -18,7 +18,6 @@ It is generated from these files:
 	examples/proto/examplepb/unannotated_echo_service.proto
 
 It has these top-level messages:
-	Embedded
 	SimpleMessage
 	ABitOfEverything
 	Body
@@ -54,177 +53,17 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
-// Embedded represents a message embedded in SimpleMessage.
-type Embedded struct {
-	// Types that are valid to be assigned to Mark:
-	//	*Embedded_Progress
-	//	*Embedded_Note
-	Mark isEmbedded_Mark `protobuf_oneof:"mark"`
-}
-
-func (m *Embedded) Reset()                    { *m = Embedded{} }
-func (m *Embedded) String() string            { return proto.CompactTextString(m) }
-func (*Embedded) ProtoMessage()               {}
-func (*Embedded) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type isEmbedded_Mark interface {
-	isEmbedded_Mark()
-}
-
-type Embedded_Progress struct {
-	Progress int64 `protobuf:"varint,1,opt,name=progress,oneof"`
-}
-type Embedded_Note struct {
-	Note string `protobuf:"bytes,2,opt,name=note,oneof"`
-}
-
-func (*Embedded_Progress) isEmbedded_Mark() {}
-func (*Embedded_Note) isEmbedded_Mark()     {}
-
-func (m *Embedded) GetMark() isEmbedded_Mark {
-	if m != nil {
-		return m.Mark
-	}
-	return nil
-}
-
-func (m *Embedded) GetProgress() int64 {
-	if x, ok := m.GetMark().(*Embedded_Progress); ok {
-		return x.Progress
-	}
-	return 0
-}
-
-func (m *Embedded) GetNote() string {
-	if x, ok := m.GetMark().(*Embedded_Note); ok {
-		return x.Note
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Embedded) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Embedded_OneofMarshaler, _Embedded_OneofUnmarshaler, _Embedded_OneofSizer, []interface{}{
-		(*Embedded_Progress)(nil),
-		(*Embedded_Note)(nil),
-	}
-}
-
-func _Embedded_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Embedded)
-	// mark
-	switch x := m.Mark.(type) {
-	case *Embedded_Progress:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Progress))
-	case *Embedded_Note:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Note)
-	case nil:
-	default:
-		return fmt.Errorf("Embedded.Mark has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Embedded_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Embedded)
-	switch tag {
-	case 1: // mark.progress
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Mark = &Embedded_Progress{int64(x)}
-		return true, err
-	case 2: // mark.note
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Mark = &Embedded_Note{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Embedded_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Embedded)
-	// mark
-	switch x := m.Mark.(type) {
-	case *Embedded_Progress:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Progress))
-	case *Embedded_Note:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Note)))
-		n += len(x.Note)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 // SimpleMessage represents a simple message sent to the Echo service.
 type SimpleMessage struct {
 	// Id represents the message identifier.
 	Id  string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
 	Num int64  `protobuf:"varint,2,opt,name=num" json:"num,omitempty"`
-	// Types that are valid to be assigned to Code:
-	//	*SimpleMessage_LineNum
-	//	*SimpleMessage_Lang
-	Code   isSimpleMessage_Code `protobuf_oneof:"code"`
-	Status *Embedded            `protobuf:"bytes,5,opt,name=status" json:"status,omitempty"`
-	// Types that are valid to be assigned to Ext:
-	//	*SimpleMessage_En
-	//	*SimpleMessage_No
-	Ext isSimpleMessage_Ext `protobuf_oneof:"ext"`
 }
 
 func (m *SimpleMessage) Reset()                    { *m = SimpleMessage{} }
 func (m *SimpleMessage) String() string            { return proto.CompactTextString(m) }
 func (*SimpleMessage) ProtoMessage()               {}
-func (*SimpleMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-type isSimpleMessage_Code interface {
-	isSimpleMessage_Code()
-}
-type isSimpleMessage_Ext interface {
-	isSimpleMessage_Ext()
-}
-
-type SimpleMessage_LineNum struct {
-	LineNum int64 `protobuf:"varint,3,opt,name=line_num,json=lineNum,oneof"`
-}
-type SimpleMessage_Lang struct {
-	Lang string `protobuf:"bytes,4,opt,name=lang,oneof"`
-}
-type SimpleMessage_En struct {
-	En int64 `protobuf:"varint,6,opt,name=en,oneof"`
-}
-type SimpleMessage_No struct {
-	No *Embedded `protobuf:"bytes,7,opt,name=no,oneof"`
-}
-
-func (*SimpleMessage_LineNum) isSimpleMessage_Code() {}
-func (*SimpleMessage_Lang) isSimpleMessage_Code()    {}
-func (*SimpleMessage_En) isSimpleMessage_Ext()       {}
-func (*SimpleMessage_No) isSimpleMessage_Ext()       {}
-
-func (m *SimpleMessage) GetCode() isSimpleMessage_Code {
-	if m != nil {
-		return m.Code
-	}
-	return nil
-}
-func (m *SimpleMessage) GetExt() isSimpleMessage_Ext {
-	if m != nil {
-		return m.Ext
-	}
-	return nil
-}
+func (*SimpleMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
 func (m *SimpleMessage) GetId() string {
 	if m != nil {
@@ -240,153 +79,7 @@ func (m *SimpleMessage) GetNum() int64 {
 	return 0
 }
 
-func (m *SimpleMessage) GetLineNum() int64 {
-	if x, ok := m.GetCode().(*SimpleMessage_LineNum); ok {
-		return x.LineNum
-	}
-	return 0
-}
-
-func (m *SimpleMessage) GetLang() string {
-	if x, ok := m.GetCode().(*SimpleMessage_Lang); ok {
-		return x.Lang
-	}
-	return ""
-}
-
-func (m *SimpleMessage) GetStatus() *Embedded {
-	if m != nil {
-		return m.Status
-	}
-	return nil
-}
-
-func (m *SimpleMessage) GetEn() int64 {
-	if x, ok := m.GetExt().(*SimpleMessage_En); ok {
-		return x.En
-	}
-	return 0
-}
-
-func (m *SimpleMessage) GetNo() *Embedded {
-	if x, ok := m.GetExt().(*SimpleMessage_No); ok {
-		return x.No
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*SimpleMessage) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _SimpleMessage_OneofMarshaler, _SimpleMessage_OneofUnmarshaler, _SimpleMessage_OneofSizer, []interface{}{
-		(*SimpleMessage_LineNum)(nil),
-		(*SimpleMessage_Lang)(nil),
-		(*SimpleMessage_En)(nil),
-		(*SimpleMessage_No)(nil),
-	}
-}
-
-func _SimpleMessage_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*SimpleMessage)
-	// code
-	switch x := m.Code.(type) {
-	case *SimpleMessage_LineNum:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.LineNum))
-	case *SimpleMessage_Lang:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Lang)
-	case nil:
-	default:
-		return fmt.Errorf("SimpleMessage.Code has unexpected type %T", x)
-	}
-	// ext
-	switch x := m.Ext.(type) {
-	case *SimpleMessage_En:
-		b.EncodeVarint(6<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.En))
-	case *SimpleMessage_No:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.No); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("SimpleMessage.Ext has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _SimpleMessage_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*SimpleMessage)
-	switch tag {
-	case 3: // code.line_num
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Code = &SimpleMessage_LineNum{int64(x)}
-		return true, err
-	case 4: // code.lang
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Code = &SimpleMessage_Lang{x}
-		return true, err
-	case 6: // ext.en
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Ext = &SimpleMessage_En{int64(x)}
-		return true, err
-	case 7: // ext.no
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Embedded)
-		err := b.DecodeMessage(msg)
-		m.Ext = &SimpleMessage_No{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _SimpleMessage_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*SimpleMessage)
-	// code
-	switch x := m.Code.(type) {
-	case *SimpleMessage_LineNum:
-		n += proto.SizeVarint(3<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.LineNum))
-	case *SimpleMessage_Lang:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Lang)))
-		n += len(x.Lang)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// ext
-	switch x := m.Ext.(type) {
-	case *SimpleMessage_En:
-		n += proto.SizeVarint(6<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.En))
-	case *SimpleMessage_No:
-		s := proto.Size(x.No)
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
 func init() {
-	proto.RegisterType((*Embedded)(nil), "grpc.gateway.examples.examplepb.Embedded")
 	proto.RegisterType((*SimpleMessage)(nil), "grpc.gateway.examples.examplepb.SimpleMessage")
 }
 
@@ -543,35 +236,23 @@ var _EchoService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("examples/proto/examplepb/echo_service.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 470 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x3f, 0x6f, 0xd3, 0x40,
-	0x14, 0xef, 0xd9, 0x6e, 0x9a, 0xbc, 0x08, 0x54, 0x9d, 0x40, 0x98, 0xb4, 0xa8, 0x91, 0xc5, 0x10,
-	0x8a, 0xe4, 0x53, 0xc2, 0x06, 0x13, 0x11, 0x45, 0x5d, 0x60, 0x70, 0xb7, 0x2c, 0xd1, 0xc5, 0xf7,
-	0xe4, 0x5a, 0xd8, 0x77, 0x96, 0x7d, 0x29, 0x8d, 0xac, 0x2c, 0x48, 0x6c, 0x30, 0xb1, 0xf3, 0x11,
-	0xd8, 0xf8, 0x18, 0x4c, 0x7c, 0x05, 0x3e, 0x08, 0xba, 0x4b, 0x1c, 0x09, 0x5a, 0xb5, 0xea, 0x90,
-	0xcd, 0xef, 0xcf, 0xef, 0xfd, 0x7e, 0xf7, 0x7b, 0xcf, 0xf0, 0x1c, 0x2f, 0x79, 0x5e, 0x64, 0x58,
-	0xb1, 0xa2, 0x54, 0x5a, 0xb1, 0x75, 0x58, 0xcc, 0x18, 0xc6, 0xe7, 0x6a, 0x5a, 0x61, 0x79, 0x91,
-	0xc6, 0x18, 0xda, 0x22, 0x3d, 0x4a, 0xca, 0x22, 0x0e, 0x13, 0xae, 0xf1, 0x23, 0x5f, 0x84, 0x0d,
-	0x32, 0xdc, 0x60, 0x7a, 0x87, 0x89, 0x52, 0x49, 0x86, 0x8c, 0x17, 0x29, 0xe3, 0x52, 0x2a, 0xcd,
-	0x75, 0xaa, 0x64, 0xb5, 0x82, 0x07, 0x6f, 0xa1, 0x7d, 0x92, 0xcf, 0x50, 0x08, 0x14, 0xf4, 0x10,
-	0xda, 0x45, 0xa9, 0x92, 0x12, 0xab, 0xca, 0x27, 0x7d, 0x32, 0x70, 0x4f, 0x77, 0xa2, 0x4d, 0x86,
-	0x3e, 0x00, 0x4f, 0x2a, 0x8d, 0xbe, 0xd3, 0x27, 0x83, 0xce, 0xe9, 0x4e, 0x64, 0xa3, 0x71, 0x0b,
-	0xbc, 0x9c, 0x97, 0x1f, 0x82, 0xcf, 0x0e, 0xdc, 0x3b, 0x4b, 0x0d, 0xe5, 0x3b, 0xac, 0x2a, 0x9e,
-	0x20, 0xbd, 0x0f, 0x4e, 0x2a, 0xec, 0x9c, 0x4e, 0xe4, 0xa4, 0x82, 0xee, 0x83, 0x2b, 0xe7, 0xb9,
-	0x85, 0xbb, 0x91, 0xf9, 0xa4, 0x07, 0xd0, 0xce, 0x52, 0x89, 0x53, 0x93, 0x76, 0xd7, 0x7c, 0x7b,
-	0x26, 0xf3, 0x7e, 0x9e, 0x1b, 0xba, 0x8c, 0xcb, 0xc4, 0xf7, 0x1a, 0x3a, 0x13, 0xd1, 0xd7, 0xd0,
-	0xaa, 0x34, 0xd7, 0xf3, 0xca, 0xdf, 0xed, 0x93, 0x41, 0x77, 0xf4, 0x2c, 0xbc, 0xe5, 0xf9, 0x61,
-	0xf3, 0xba, 0x68, 0x0d, 0xa4, 0xfb, 0xe0, 0xa0, 0xf4, 0x5b, 0x96, 0x8f, 0x44, 0x0e, 0x4a, 0xfa,
-	0x0a, 0x1c, 0xa9, 0xfc, 0xbd, 0x3b, 0x0e, 0x34, 0x60, 0xa9, 0x8c, 0x01, 0xb1, 0x12, 0x38, 0xde,
-	0x05, 0x17, 0x2f, 0xf5, 0xe8, 0x97, 0x07, 0xdd, 0x93, 0xf8, 0x5c, 0x9d, 0xad, 0x96, 0x44, 0xbf,
-	0x3b, 0xe0, 0x99, 0x98, 0x86, 0xb7, 0x0e, 0xfe, 0xc7, 0xbe, 0xde, 0x1d, 0xfb, 0x83, 0x9f, 0xe4,
-	0xd3, 0xef, 0x3f, 0xdf, 0x9c, 0x1f, 0x24, 0x78, 0xc8, 0x2e, 0x86, 0xcd, 0xcd, 0xd8, 0x8b, 0x61,
-	0x75, 0x2a, 0x96, 0x93, 0x27, 0xf4, 0xe0, 0xda, 0x02, 0xab, 0xe5, 0x3c, 0x5f, 0x4e, 0x9e, 0xd2,
-	0xe0, 0x86, 0x32, 0xab, 0x8d, 0xfd, 0xcb, 0xc9, 0x90, 0xb2, 0xff, 0xbb, 0x86, 0xeb, 0xb6, 0x66,
-	0x95, 0x4b, 0x56, 0xaf, 0x9c, 0x0e, 0xcd, 0x81, 0x5c, 0xcb, 0x3b, 0x62, 0xb5, 0x54, 0xab, 0x32,
-	0xfd, 0x42, 0xa0, 0x6d, 0x0c, 0x1a, 0x2b, 0xb1, 0xd8, 0xba, 0x49, 0x7d, 0xeb, 0x51, 0xef, 0xaa,
-	0x45, 0xd3, 0x99, 0x12, 0x8b, 0x97, 0xe4, 0x98, 0x7e, 0x25, 0x00, 0x46, 0xce, 0x1b, 0xcc, 0x50,
-	0xe3, 0xd6, 0x05, 0x1d, 0x59, 0x41, 0x8f, 0x8f, 0x1f, 0x5d, 0x11, 0x24, 0xac, 0x80, 0x71, 0x77,
-	0xd2, 0xd9, 0x60, 0x67, 0x2d, 0xfb, 0xcf, 0xbe, 0xf8, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xe9, 0xdb,
-	0x6f, 0x39, 0x21, 0x04, 0x00, 0x00,
+	// 288 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4e, 0xad, 0x48, 0xcc,
+	0x2d, 0xc8, 0x49, 0x2d, 0xd6, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x87, 0x72, 0x0b, 0x92, 0xf4,
+	0x53, 0x93, 0x33, 0xf2, 0xe3, 0x8b, 0x53, 0x8b, 0xca, 0x32, 0x93, 0x53, 0xf5, 0xc0, 0x92, 0x42,
+	0xf2, 0xe9, 0x45, 0x05, 0xc9, 0x7a, 0xe9, 0x89, 0x25, 0xa9, 0xe5, 0x89, 0x95, 0x7a, 0x30, 0x9d,
+	0x7a, 0x70, 0x3d, 0x52, 0x32, 0xe9, 0xf9, 0xf9, 0xe9, 0x39, 0xa9, 0xfa, 0x89, 0x05, 0x99, 0xfa,
+	0x89, 0x79, 0x79, 0xf9, 0x25, 0x89, 0x25, 0x99, 0xf9, 0x79, 0xc5, 0x10, 0xed, 0x4a, 0x86, 0x5c,
+	0xbc, 0xc1, 0x99, 0x20, 0x95, 0xbe, 0xa9, 0xc5, 0xc5, 0x89, 0xe9, 0xa9, 0x42, 0x7c, 0x5c, 0x4c,
+	0x99, 0x29, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x4c, 0x99, 0x29, 0x42, 0x02, 0x5c, 0xcc,
+	0x79, 0xa5, 0xb9, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xcc, 0x41, 0x20, 0xa6, 0xd1, 0x65, 0x66, 0x2e,
+	0x6e, 0xd7, 0xe4, 0x8c, 0xfc, 0x60, 0x88, 0x3b, 0x84, 0x96, 0x30, 0x72, 0xb1, 0x80, 0xf8, 0x42,
+	0x7a, 0x7a, 0x04, 0xdc, 0xa2, 0x87, 0x62, 0x95, 0x14, 0x89, 0xea, 0x95, 0x6c, 0x9a, 0x2e, 0x3f,
+	0x99, 0xcc, 0x64, 0xa6, 0x24, 0xaa, 0x5f, 0x66, 0x08, 0x0b, 0x14, 0x70, 0x90, 0xe8, 0x57, 0x67,
+	0xa6, 0xd4, 0x46, 0xc9, 0x0a, 0x49, 0x63, 0x95, 0xd0, 0xaf, 0xce, 0x2b, 0xcd, 0xad, 0x15, 0xea,
+	0x61, 0xe4, 0xe2, 0x00, 0x39, 0xd3, 0x29, 0x3f, 0xa5, 0x92, 0xe6, 0x4e, 0x55, 0x00, 0x3b, 0x55,
+	0x0a, 0xd3, 0xa9, 0xf1, 0x49, 0xf9, 0x29, 0x95, 0x56, 0x8c, 0x5a, 0x42, 0xbd, 0x8c, 0x5c, 0x5c,
+	0x20, 0xe7, 0xb8, 0xa4, 0xe6, 0xa4, 0x96, 0xa4, 0xd2, 0xdc, 0x41, 0xf2, 0x60, 0x07, 0x49, 0x6a,
+	0x89, 0x63, 0x38, 0x28, 0x05, 0xec, 0x00, 0x27, 0xee, 0x28, 0x4e, 0xb8, 0xde, 0x24, 0x36, 0x70,
+	0xe2, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x46, 0x53, 0x05, 0xe1, 0x8a, 0x02, 0x00, 0x00,
 }
diff --git a/examples/proto/examplepb/echo_service.pb.gw.go b/examples/proto/examplepb/echo_service.pb.gw.go
index d4f17ec99e5..c281543bedb 100644
--- a/examples/proto/examplepb/echo_service.pb.gw.go
+++ b/examples/proto/examplepb/echo_service.pb.gw.go
@@ -63,10 +63,6 @@ func request_EchoService_Echo_0(ctx context.Context, marshaler runtime.Marshaler
 
 }
 
-var (
-	filter_EchoService_Echo_1 = &utilities.DoubleArray{Encoding: map[string]int{"id": 0, "num": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
-)
-
 func request_EchoService_Echo_1(ctx context.Context, marshaler runtime.Marshaler, client EchoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq SimpleMessage
 	var metadata runtime.ServerMetadata
@@ -100,175 +96,6 @@ func request_EchoService_Echo_1(ctx context.Context, marshaler runtime.Marshaler
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "num", err)
 	}
 
-	if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_EchoService_Echo_1); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
-
-}
-
-var (
-	filter_EchoService_Echo_2 = &utilities.DoubleArray{Encoding: map[string]int{"id": 0, "num": 1, "lang": 2}, Base: []int{1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 3, 4}}
-)
-
-func request_EchoService_Echo_2(ctx context.Context, marshaler runtime.Marshaler, client EchoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq SimpleMessage
-	var metadata runtime.ServerMetadata
-
-	var (
-		val string
-		ok  bool
-		err error
-		_   = err
-	)
-
-	val, ok = pathParams["id"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
-	}
-
-	protoReq.Id, err = runtime.String(val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
-	}
-
-	val, ok = pathParams["num"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "num")
-	}
-
-	protoReq.Num, err = runtime.Int64(val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "num", err)
-	}
-
-	val, ok = pathParams["lang"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "lang")
-	}
-
-	func() *SimpleMessage_Lang {
-		msg := &protoReq
-		oneof := msg.Code
-		if _, ok := oneof.(*SimpleMessage_Lang); oneof == nil || !ok {
-			oneof = new(SimpleMessage_Lang)
-			msg.Code = oneof
-		}
-		return oneof.(*SimpleMessage_Lang)
-	}().Lang, err = runtime.String(val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "lang", err)
-	}
-
-	if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_EchoService_Echo_2); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
-
-}
-
-var (
-	filter_EchoService_Echo_3 = &utilities.DoubleArray{Encoding: map[string]int{"id": 0, "line_num": 1, "status": 2, "note": 3}, Base: []int{1, 1, 2, 1, 3, 0, 0, 0}, Check: []int{0, 1, 1, 1, 4, 2, 3, 5}}
-)
-
-func request_EchoService_Echo_3(ctx context.Context, marshaler runtime.Marshaler, client EchoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq SimpleMessage
-	var metadata runtime.ServerMetadata
-
-	var (
-		val string
-		ok  bool
-		err error
-		_   = err
-	)
-
-	val, ok = pathParams["id"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
-	}
-
-	protoReq.Id, err = runtime.String(val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
-	}
-
-	val, ok = pathParams["line_num"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "line_num")
-	}
-
-	func() *SimpleMessage_LineNum {
-		msg := &protoReq
-		oneof := msg.Code
-		if _, ok := oneof.(*SimpleMessage_LineNum); oneof == nil || !ok {
-			oneof = new(SimpleMessage_LineNum)
-			msg.Code = oneof
-		}
-		return oneof.(*SimpleMessage_LineNum)
-	}().LineNum, err = runtime.Int64(val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "line_num", err)
-	}
-
-	val, ok = pathParams["status.note"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "status.note")
-	}
-
-	err = runtime.PopulateFieldFromPath(&protoReq, "status.note", val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "status.note", err)
-	}
-
-	if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_EchoService_Echo_3); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
-
-}
-
-var (
-	filter_EchoService_Echo_4 = &utilities.DoubleArray{Encoding: map[string]int{"no": 0, "note": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}}
-)
-
-func request_EchoService_Echo_4(ctx context.Context, marshaler runtime.Marshaler, client EchoServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq SimpleMessage
-	var metadata runtime.ServerMetadata
-
-	var (
-		val string
-		ok  bool
-		err error
-		_   = err
-	)
-
-	val, ok = pathParams["no.note"]
-	if !ok {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "no.note")
-	}
-
-	err = runtime.PopulateFieldFromPath(&protoReq, "no.note", val)
-
-	if err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "no.note", err)
-	}
-
-	if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_EchoService_Echo_4); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	msg, err := client.Echo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
 
@@ -400,93 +227,6 @@ func RegisterEchoServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 
 	})
 
-	mux.Handle("GET", pattern_EchoService_Echo_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		if cn, ok := w.(http.CloseNotifier); ok {
-			go func(done <-chan struct{}, closed <-chan bool) {
-				select {
-				case <-done:
-				case <-closed:
-					cancel()
-				}
-			}(ctx.Done(), cn.CloseNotify())
-		}
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := request_EchoService_Echo_2(rctx, inboundMarshaler, client, req, pathParams)
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_EchoService_Echo_2(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
-	mux.Handle("GET", pattern_EchoService_Echo_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		if cn, ok := w.(http.CloseNotifier); ok {
-			go func(done <-chan struct{}, closed <-chan bool) {
-				select {
-				case <-done:
-				case <-closed:
-					cancel()
-				}
-			}(ctx.Done(), cn.CloseNotify())
-		}
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := request_EchoService_Echo_3(rctx, inboundMarshaler, client, req, pathParams)
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_EchoService_Echo_3(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
-	mux.Handle("GET", pattern_EchoService_Echo_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		if cn, ok := w.(http.CloseNotifier); ok {
-			go func(done <-chan struct{}, closed <-chan bool) {
-				select {
-				case <-done:
-				case <-closed:
-					cancel()
-				}
-			}(ctx.Done(), cn.CloseNotify())
-		}
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := request_EchoService_Echo_4(rctx, inboundMarshaler, client, req, pathParams)
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_EchoService_Echo_4(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
 	mux.Handle("POST", pattern_EchoService_EchoBody_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -553,12 +293,6 @@ var (
 
 	pattern_EchoService_Echo_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"v1", "example", "echo", "id", "num"}, ""))
 
-	pattern_EchoService_Echo_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"v1", "example", "echo", "id", "num", "lang"}, ""))
-
-	pattern_EchoService_Echo_3 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"v1", "example", "echo1", "id", "line_num", "status.note"}, ""))
-
-	pattern_EchoService_Echo_4 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "example", "echo2", "no.note"}, ""))
-
 	pattern_EchoService_EchoBody_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "example", "echo_body"}, ""))
 
 	pattern_EchoService_EchoDelete_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "example", "echo_delete"}, ""))
@@ -569,12 +303,6 @@ var (
 
 	forward_EchoService_Echo_1 = runtime.ForwardResponseMessage
 
-	forward_EchoService_Echo_2 = runtime.ForwardResponseMessage
-
-	forward_EchoService_Echo_3 = runtime.ForwardResponseMessage
-
-	forward_EchoService_Echo_4 = runtime.ForwardResponseMessage
-
 	forward_EchoService_EchoBody_0 = runtime.ForwardResponseMessage
 
 	forward_EchoService_EchoDelete_0 = runtime.ForwardResponseMessage
diff --git a/examples/proto/examplepb/echo_service.proto b/examples/proto/examplepb/echo_service.proto
index 710d0576e45..506917c11c1 100644
--- a/examples/proto/examplepb/echo_service.proto
+++ b/examples/proto/examplepb/echo_service.proto
@@ -9,28 +9,11 @@ package grpc.gateway.examples.examplepb;
 
 import "google/api/annotations.proto";
 
-// Embedded represents a message embedded in SimpleMessage.
-message Embedded {
-	oneof mark {
-		int64 progress = 1;
-		string note = 2;
-	}
-}
-
 // SimpleMessage represents a simple message sent to the Echo service.
 message SimpleMessage {
 	// Id represents the message identifier.
 	string id = 1;
 	int64 num = 2;
-	oneof code {
-		int64 line_num = 3;
-		string lang = 4;
-	}
-	Embedded status = 5;
-	oneof ext {
-		int64 en = 6;
-		Embedded no = 7;
-	}
 }
 
 // Echo service responds to incoming echo requests.
@@ -45,15 +28,6 @@ service EchoService {
 			additional_bindings {
 				get: "/v1/example/echo/{id}/{num}"
 			}
-			additional_bindings {
-				get: "/v1/example/echo/{id}/{num}/{lang}"
-			}
-			additional_bindings {
-				get: "/v1/example/echo1/{id}/{line_num}/{status.note}"
-			}
-			additional_bindings {
-				get: "/v1/example/echo2/{no.note}"
-			}
 		};
 	}
 	// EchoBody method receives a simple message and returns it.
diff --git a/examples/proto/examplepb/echo_service.swagger.json b/examples/proto/examplepb/echo_service.swagger.json
index c14354ffbce..f76f9289a81 100644
--- a/examples/proto/examplepb/echo_service.swagger.json
+++ b/examples/proto/examplepb/echo_service.swagger.json
@@ -68,278 +68,6 @@
             "required": true,
             "type": "string",
             "format": "int64"
-          },
-          {
-            "name": "line_num",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "lang",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "status.progress",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "status.note",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "en",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "no.progress",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "no.note",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          }
-        ],
-        "tags": [
-          "EchoService"
-        ]
-      }
-    },
-    "/v1/example/echo/{id}/{num}/{lang}": {
-      "get": {
-        "summary": "Echo method receives a simple message and returns it.",
-        "description": "The message posted as the id parameter will also be\nreturned.",
-        "operationId": "Echo3",
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/examplepbSimpleMessage"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "num",
-            "in": "path",
-            "required": true,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "lang",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "line_num",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "status.progress",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "status.note",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "en",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "no.progress",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "no.note",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          }
-        ],
-        "tags": [
-          "EchoService"
-        ]
-      }
-    },
-    "/v1/example/echo1/{id}/{line_num}/{status.note}": {
-      "get": {
-        "summary": "Echo method receives a simple message and returns it.",
-        "description": "The message posted as the id parameter will also be\nreturned.",
-        "operationId": "Echo4",
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/examplepbSimpleMessage"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "line_num",
-            "in": "path",
-            "required": true,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "status.note",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "num",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "lang",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "status.progress",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "en",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "no.progress",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          }
-        ],
-        "tags": [
-          "EchoService"
-        ]
-      }
-    },
-    "/v1/example/echo2/{no.note}": {
-      "get": {
-        "summary": "Echo method receives a simple message and returns it.",
-        "description": "The message posted as the id parameter will also be\nreturned.",
-        "operationId": "Echo5",
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/examplepbSimpleMessage"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "no.note",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "id",
-            "description": "Id represents the message identifier.",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "num",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "line_num",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "lang",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "status.progress",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "en",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "no.progress",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
           }
         ],
         "tags": [
@@ -400,52 +128,6 @@
             "required": false,
             "type": "string",
             "format": "int64"
-          },
-          {
-            "name": "line_num",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "lang",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "status.progress",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "status.note",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "en",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "no.progress",
-            "in": "query",
-            "required": false,
-            "type": "string",
-            "format": "int64"
-          },
-          {
-            "name": "no.note",
-            "in": "query",
-            "required": false,
-            "type": "string"
           }
         ],
         "tags": [
@@ -455,19 +137,6 @@
     }
   },
   "definitions": {
-    "examplepbEmbedded": {
-      "type": "object",
-      "properties": {
-        "progress": {
-          "type": "string",
-          "format": "int64"
-        },
-        "note": {
-          "type": "string"
-        }
-      },
-      "description": "Embedded represents a message embedded in SimpleMessage."
-    },
     "examplepbSimpleMessage": {
       "type": "object",
       "properties": {
@@ -478,23 +147,6 @@
         "num": {
           "type": "string",
           "format": "int64"
-        },
-        "line_num": {
-          "type": "string",
-          "format": "int64"
-        },
-        "lang": {
-          "type": "string"
-        },
-        "status": {
-          "$ref": "#/definitions/examplepbEmbedded"
-        },
-        "en": {
-          "type": "string",
-          "format": "int64"
-        },
-        "no": {
-          "$ref": "#/definitions/examplepbEmbedded"
         }
       },
       "description": "SimpleMessage represents a simple message sent to the Echo service."

From 51d29a497d4a629f5cbd16815d115e28fa36daf9 Mon Sep 17 00:00:00 2001
From: Yuki Yugui Sonoda <yugui@yugui.jp>
Date: Mon, 30 Apr 2018 21:02:45 +0900
Subject: [PATCH 6/7] Add more tests for oneof fields in query parameters

---
 examples/integration/integration_test.go | 59 ++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/examples/integration/integration_test.go b/examples/integration/integration_test.go
index e178b328e16..79b56d7909e 100644
--- a/examples/integration/integration_test.go
+++ b/examples/integration/integration_test.go
@@ -904,6 +904,65 @@ func TestOneof(t *testing.T) {
 		},
 		// NOTE: deeply nested fields are not allowed in body by spec.
 
+		// query param: primitive field in a oneof clause
+		{
+			path: "/v1/example/a_bit_of_everything;echo?oneof_value_string=foo",
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueString{"foo"},
+			},
+		},
+		// path param: primitive field in a message field in a oneof clause
+		{
+			path: "/v1/example/a_bit_of_everything;echo?oneof_value_nested%2Ename=foo",
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueNested{
+					&gw.ABitOfEverything_Nested{
+						Name: "foo",
+					},
+				},
+			},
+		},
+		// path param: primitive field in a message field in a message field in a oneof clause
+		{
+			path: "/v1/example/a_bit_of_everything;echo?oneof_value_nested%2Edeeper_nested_value%2Evalue=foo",
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueNested{
+					&gw.ABitOfEverything_Nested{
+						DeeperNestedValue: &sub.StringMessage{
+							Value: proto.String("foo"),
+						},
+					},
+				},
+			},
+		},
+		// path param: primitive field in a oneof clause in a message field in a oneof clause.
+		{
+			path: "/v1/example/a_bit_of_everything;echo?oneof_value_nested%2Eoneof_value_terminal=foo",
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueNested{
+					&gw.ABitOfEverything_Nested{
+						OneofValue: &gw.ABitOfEverything_Nested_OneofValueTerminal{
+							"foo",
+						},
+					},
+				},
+			},
+		},
+		// path param: primitive field in a message field in a oneof clause in a message field in a oneof clause.
+		{
+			path: "/v1/example/a_bit_of_everything;echo?oneof_value_nested%2Eoneof_value_deeper_nested%2Evalue=foo",
+			want: gw.ABitOfEverything{
+				OneofValue: &gw.ABitOfEverything_OneofValueNested{
+					&gw.ABitOfEverything_Nested{
+						OneofValue: &gw.ABitOfEverything_Nested_OneofValueDeeperNested{
+							&sub.StringMessage{
+								Value: proto.String("foo"),
+							},
+						},
+					},
+				},
+			},
+		},
 	} {
 		url := base + spec.path
 		resp, err := http.Post(url, "application/json", strings.NewReader(spec.payload))

From fd1fba2bf1677e46128d333faaed40735fb844e5 Mon Sep 17 00:00:00 2001
From: Yuki Yugui Sonoda <yugui@yugui.jp>
Date: Mon, 30 Apr 2018 21:24:18 +0900
Subject: [PATCH 7/7] Avoid runtime dereference of nil

Add a check on loading google.api.HttpRule messages
---
 .../descriptor/services.go                    |  4 ++
 .../descriptor/services_test.go               | 43 +++++++++++++++++++
 protoc-gen-grpc-gateway/descriptor/types.go   |  4 ++
 3 files changed, 51 insertions(+)

diff --git a/protoc-gen-grpc-gateway/descriptor/services.go b/protoc-gen-grpc-gateway/descriptor/services.go
index c200e57e275..d552da048af 100644
--- a/protoc-gen-grpc-gateway/descriptor/services.go
+++ b/protoc-gen-grpc-gateway/descriptor/services.go
@@ -235,6 +235,9 @@ func (r *Registry) newBody(meth *Method, path string) (*Body, error) {
 	if err != nil {
 		return nil, err
 	}
+	if len(fields) > 1 {
+		return nil, fmt.Errorf("body field must be present at the top-level of request message type")
+	}
 	return &Body{FieldPath: FieldPath(fields)}, nil
 }
 
@@ -278,6 +281,7 @@ func (r *Registry) resolveFieldPath(msg *Message, path string) ([]FieldPathCompo
 			return nil, fmt.Errorf("no field %q found in %s", path, root.GetName())
 		}
 		if f.GetLabel() == descriptor.FieldDescriptorProto_LABEL_REPEATED {
+			// https://groups.google.com/d/msg/grpc-io/Xqx80hG0D44/yyqfF2gTEFMJ
 			return nil, fmt.Errorf("repeated field not allowed in field path: %s in %s", f.GetName(), path)
 		}
 		result = append(result, FieldPathComponent{Name: c, Target: f})
diff --git a/protoc-gen-grpc-gateway/descriptor/services_test.go b/protoc-gen-grpc-gateway/descriptor/services_test.go
index 93a8f67ce05..8f766708226 100644
--- a/protoc-gen-grpc-gateway/descriptor/services_test.go
+++ b/protoc-gen-grpc-gateway/descriptor/services_test.go
@@ -902,6 +902,49 @@ func TestExtractServicesWithError(t *testing.T) {
 				`,
 			},
 		},
+		// 2nd-level field in body
+		{
+			target: "path/to/example.proto",
+			srcs: []string{
+				`
+					name: "path/to/example.proto",
+					package: "example"
+					message_type <
+					name: "OuterMessage"
+						nested_type <
+							name: "StringMessage"
+							field <
+								name: "string"
+								number: 1
+								label: LABEL_OPTIONAL
+								type: TYPE_STRING
+							>
+						>
+						field <
+							name: "nested"
+							number: 1
+							label: LABEL_OPTIONAL
+							type: TYPE_MESSAGE
+							type_name: "StringMessage"
+						>
+					>
+					service <
+						name: "ExampleService"
+						method <
+							name: "Echo"
+							input_type: "OuterMessage"
+							output_type: "OuterMessage"
+							options <
+								[google.api.http] <
+									post: "/v1/example/echo"
+									body: "nested.string"
+								>
+							>
+						>
+					>
+				`,
+			},
+		},
 	} {
 		reg := NewRegistry()
 
diff --git a/protoc-gen-grpc-gateway/descriptor/types.go b/protoc-gen-grpc-gateway/descriptor/types.go
index c489adfc301..37125d7594b 100644
--- a/protoc-gen-grpc-gateway/descriptor/types.go
+++ b/protoc-gen-grpc-gateway/descriptor/types.go
@@ -349,6 +349,8 @@ func (c FieldPathComponent) ValueExpr() string {
 }
 
 var (
+	// The table entries are ordered by enum numbers of the keys.
+
 	proto3ConvertFuncs = map[descriptor.FieldDescriptorProto_Type]string{
 		descriptor.FieldDescriptorProto_TYPE_DOUBLE:  "runtime.Float64",
 		descriptor.FieldDescriptorProto_TYPE_FLOAT:   "runtime.Float32",
@@ -394,6 +396,8 @@ var (
 		descriptor.FieldDescriptorProto_TYPE_SINT64:   "runtime.Int64P",
 	}
 
+	// wellKnownTypeConv keeps conversion functions for well-known
+	// but not primitive types.
 	wellKnownTypeConv = map[string]string{
 		".google.protobuf.Timestamp": "runtime.Timestamp",
 		".google.protobuf.Duration":  "runtime.Duration",