- code-gen: go url template support

microsoft · Oct 20, 2021 · bbf6866 · bbf6866
1 parent e4e33d1
commit bbf6866
Show file tree

Hide file tree

Showing 39 changed files with 1,148 additions and 974 deletions.
diff --git a/msgraph-mail/go/utilities/api_client.go b/msgraph-mail/go/utilities/api_client.go
@@ -7,21 +7,28 @@ import (
 )
 
 type ApiClient struct {
-	pathSegment    string
-	requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter
+	requestAdapter        ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter
+	urlTemplate           string
+	urlTemplateParameters map[string]string
 }
 
 func NewApiClient(requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter) *ApiClient {
 	m := &ApiClient{}
-	m.pathSegment = "https://graph.microsoft.com/v1.0"
+	m.urlTemplate = "https://graph.microsoft.com/v1.0"
+	m.urlTemplateParameters = make(map[string]string)
 	m.requestAdapter = requestAdapter
 	// ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RegisterDefaultSerializer(func() i04eb5309aeaafadd28374d79c8471df9b267510b4dc2e3144c378c50f6fd7b55.SerializationWriterFactory { return id1ae20a9e00c372d14381acc2299aa946a25894316974139983388e4b11bb84b.NewJsonSerializationWriterFactory() })
 	// ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RegisterDefaultDeserializer(func() i04eb5309aeaafadd28374d79c8471df9b267510b4dc2e3144c378c50f6fd7b55.ParseNodeFactory { return id1ae20a9e00c372d14381acc2299aa946a25894316974139983388e4b11bb84b.NewJsonParseNodeFactory() })
 	return m
 }
 func (m *ApiClient) Users() ie51e765764484004639cdfca9cb330e622fbf042d77be5ba8e7a002ffc8f8ed7.UsersRequestBuilder {
-	return *ie51e765764484004639cdfca9cb330e622fbf042d77be5ba8e7a002ffc8f8ed7.NewUsersRequestBuilder(m.pathSegment, m.requestAdapter, false)
+	return *ie51e765764484004639cdfca9cb330e622fbf042d77be5ba8e7a002ffc8f8ed7.NewUsersRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter)
 }
 func (m *ApiClient) UsersById(id string) i993da4875956788f567345c5c97cefaefa8f33555fde8bb29d1fd49e374ccccd.UserRequestBuilder {
-	return *i993da4875956788f567345c5c97cefaefa8f33555fde8bb29d1fd49e374ccccd.NewUserRequestBuilder(m.pathSegment+"/users/"+id, m.requestAdapter, false)
+	urlTplParams := make(map[string]string)
+	for idx, item := range m.urlTemplateParameters {
+		urlTplParams[idx] = item
+	}
+	urlTplParams["user_id"] = id
+	return *i993da4875956788f567345c5c97cefaefa8f33555fde8bb29d1fd49e374ccccd.NewUserRequestBuilderInternal(urlTplParams, m.requestAdapter)
 }
diff --git a/msgraph-mail/go/utilities/go.sum b/msgraph-mail/go/utilities/go.sum
@@ -1,2 +1,4 @@
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/yosida95/uritemplate/v3 v3.0.1 h1:+Fs//CsT+x231WmUQhMHWMxZizMvpnkOVWop02mVCfs=
+github.com/yosida95/uritemplate/v3 v3.0.1/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
diff --git a/.../utilities/users/item/inferenceclassification/inference_classification_request_builder.go b/.../utilities/users/item/inferenceclassification/inference_classification_request_builder.go
@@ -9,99 +9,100 @@ import (
 )
 
 type InferenceClassificationRequestBuilder struct {
-    currentPath string;
-    isRawUrl bool;
-    pathSegment string;
     requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter;
+    urlTemplate string;
+    urlTemplateParameters map[string]string;
 }
 type InferenceClassificationRequestBuilderGetQueryParameters struct {
     ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase
     Expand []string;
     Select_escpaped []string;
 }
-func NewInferenceClassificationRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*InferenceClassificationRequestBuilder) {
+func NewInferenceClassificationRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*InferenceClassificationRequestBuilder) {
     m := &InferenceClassificationRequestBuilder{
     }
-    m.pathSegment = "/inferenceClassification";
+    m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification{?select,expand}";
+    urlTplParams := make(map[string]string)
+    for idx, item := range urlTemplateParameters {
+        urlTplParams[idx] = item
+    }
+    m.urlTemplateParameters = urlTemplateParameters;
     m.requestAdapter = requestAdapter;
-    m.currentPath = currentPath;
-    m.isRawUrl = isRawUrl;
     return m
 }
+func NewInferenceClassificationRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*InferenceClassificationRequestBuilder) {
+    urlParams := make(map[string]string)
+    urlParams["raw-request-url"] = rawUrl
+    return NewInferenceClassificationRequestBuilderInternal(urlParams, requestAdapter)
+}
 func (m *InferenceClassificationRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) {
     requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation()
-    err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl)
+    requestInfo.UrlTemplate = m.urlTemplate
+    requestInfo.UrlTemplateParameters = m.urlTemplateParameters
     requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE
-    if err != nil {
-        return nil, err
-    }
     if h != nil {
-        err = h(requestInfo.Headers)
+        err := h(requestInfo.Headers)
         if err != nil {
             return nil, err
         }
     }
     if o != nil {
-        err = requestInfo.AddRequestOptions(o)
+        err := requestInfo.AddRequestOptions(o)
         if err != nil {
             return nil, err
         }
     }
-    return requestInfo, err
+    return requestInfo, nil
 }
 func (m *InferenceClassificationRequestBuilder) CreateGetRequestInformation(q func (value *InferenceClassificationRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) {
     requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation()
-    err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl)
+    requestInfo.UrlTemplate = m.urlTemplate
+    requestInfo.UrlTemplateParameters = m.urlTemplateParameters
     requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET
-    if err != nil {
-        return nil, err
-    }
     if q != nil {
         qParams := new(InferenceClassificationRequestBuilderGetQueryParameters)
-        err = q(qParams)
+        err := q(qParams)
         if err != nil {
             return nil, err
         }
-        err := qParams.AddQueryParameters(requestInfo.QueryParameters)
+        err = qParams.AddQueryParameters(requestInfo.QueryParameters)
         if err != nil {
             return nil, err
         }
     }
     if h != nil {
-        err = h(requestInfo.Headers)
+        err := h(requestInfo.Headers)
         if err != nil {
             return nil, err
         }
     }
     if o != nil {
-        err = requestInfo.AddRequestOptions(o)
+        err := requestInfo.AddRequestOptions(o)
         if err != nil {
             return nil, err
         }
     }
-    return requestInfo, err
+    return requestInfo, nil
 }
 func (m *InferenceClassificationRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.InferenceClassification, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) {
     requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation()
-    err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl)
+    requestInfo.UrlTemplate = m.urlTemplate
+    requestInfo.UrlTemplateParameters = m.urlTemplateParameters
     requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH
-    if err != nil {
-        return nil, err
-    }
     requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body)
     if h != nil {
-        err = h(requestInfo.Headers)
+        err := h(requestInfo.Headers)
         if err != nil {
             return nil, err
         }
     }
     if o != nil {
-        err = requestInfo.AddRequestOptions(o)
+        err := requestInfo.AddRequestOptions(o)
         if err != nil {
             return nil, err
         }
     }
-    return requestInfo, err
+    return requestInfo, nil
 }
 func (m *InferenceClassificationRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) {
     requestInfo, err := m.CreateDeleteRequestInformation(h, o);
@@ -130,10 +131,15 @@ func (m *InferenceClassificationRequestBuilder) Get(q func (value *InferenceClas
     }
 }
 func (m *InferenceClassificationRequestBuilder) Overrides()(i3b892eb54cedbd9cc555b9f1a7958d6152b7730fa895edaed6eaa7e22b3c15ca.OverridesRequestBuilder) {
-    return *i3b892eb54cedbd9cc555b9f1a7958d6152b7730fa895edaed6eaa7e22b3c15ca.NewOverridesRequestBuilder(m.currentPath + m.pathSegment, m.requestAdapter, false);
+    return *i3b892eb54cedbd9cc555b9f1a7958d6152b7730fa895edaed6eaa7e22b3c15ca.NewOverridesRequestBuilderInternal(m.urlTemplateParameters, m.requestAdapter);
 }
 func (m *InferenceClassificationRequestBuilder) OverridesById(id string)(ie9af6222ea455c01969cfed303f450bfed10eddca9c64da588590323f4684264.InferenceClassificationOverrideRequestBuilder) {
-    return *ie9af6222ea455c01969cfed303f450bfed10eddca9c64da588590323f4684264.NewInferenceClassificationOverrideRequestBuilder(m.currentPath + m.pathSegment + "/overrides/" + id, m.requestAdapter, false);
+    urlTplParams := make(map[string]string)
+    for idx, item := range m.urlTemplateParameters {
+        urlTplParams[idx] = item
+    }
+    urlTplParams["inferenceClassificationOverride_id"] = id
+    return *ie9af6222ea455c01969cfed303f450bfed10eddca9c64da588590323f4684264.NewInferenceClassificationOverrideRequestBuilderInternal(urlTplParams, m.requestAdapter);
 }
 func (m *InferenceClassificationRequestBuilder) Patch(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.InferenceClassification, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) {
     requestInfo, err := m.CreatePatchRequestInformation(body, h, o);

diff --git a/...ferenceclassification/overrides/item/inference_classification_override_request_builder.go b/...ferenceclassification/overrides/item/inference_classification_override_request_builder.go
@@ -7,99 +7,100 @@ import (
 )
 
 type InferenceClassificationOverrideRequestBuilder struct {
-    currentPath string;
-    isRawUrl bool;
-    pathSegment string;
     requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter;
+    urlTemplate string;
+    urlTemplateParameters map[string]string;
 }
 type InferenceClassificationOverrideRequestBuilderGetQueryParameters struct {
     ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.QueryParametersBase
     Expand []string;
     Select_escpaped []string;
 }
-func NewInferenceClassificationOverrideRequestBuilder(currentPath string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter, isRawUrl bool)(*InferenceClassificationOverrideRequestBuilder) {
+func NewInferenceClassificationOverrideRequestBuilderInternal(urlTemplateParameters map[string]string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*InferenceClassificationOverrideRequestBuilder) {
     m := &InferenceClassificationOverrideRequestBuilder{
     }
-    m.pathSegment = "";
+    m.urlTemplate = "https://graph.microsoft.com/v1.0/users/{user_id}/inferenceClassification/overrides/{inferenceClassificationOverride_id}{?select,expand}";
+    urlTplParams := make(map[string]string)
+    for idx, item := range urlTemplateParameters {
+        urlTplParams[idx] = item
+    }
+    m.urlTemplateParameters = urlTemplateParameters;
     m.requestAdapter = requestAdapter;
-    m.currentPath = currentPath;
-    m.isRawUrl = isRawUrl;
     return m
 }
+func NewInferenceClassificationOverrideRequestBuilder(rawUrl string, requestAdapter ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestAdapter)(*InferenceClassificationOverrideRequestBuilder) {
+    urlParams := make(map[string]string)
+    urlParams["raw-request-url"] = rawUrl
+    return NewInferenceClassificationOverrideRequestBuilderInternal(urlParams, requestAdapter)
+}
 func (m *InferenceClassificationOverrideRequestBuilder) CreateDeleteRequestInformation(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) {
     requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation()
-    err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl)
+    requestInfo.UrlTemplate = m.urlTemplate
+    requestInfo.UrlTemplateParameters = m.urlTemplateParameters
     requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.DELETE
-    if err != nil {
-        return nil, err
-    }
     if h != nil {
-        err = h(requestInfo.Headers)
+        err := h(requestInfo.Headers)
         if err != nil {
             return nil, err
         }
     }
     if o != nil {
-        err = requestInfo.AddRequestOptions(o)
+        err := requestInfo.AddRequestOptions(o)
         if err != nil {
             return nil, err
         }
     }
-    return requestInfo, err
+    return requestInfo, nil
 }
 func (m *InferenceClassificationOverrideRequestBuilder) CreateGetRequestInformation(q func (value *InferenceClassificationOverrideRequestBuilderGetQueryParameters) (err error), h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) {
     requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation()
-    err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl)
+    requestInfo.UrlTemplate = m.urlTemplate
+    requestInfo.UrlTemplateParameters = m.urlTemplateParameters
     requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.GET
-    if err != nil {
-        return nil, err
-    }
     if q != nil {
         qParams := new(InferenceClassificationOverrideRequestBuilderGetQueryParameters)
-        err = q(qParams)
+        err := q(qParams)
         if err != nil {
             return nil, err
         }
-        err := qParams.AddQueryParameters(requestInfo.QueryParameters)
+        err = qParams.AddQueryParameters(requestInfo.QueryParameters)
         if err != nil {
             return nil, err
         }
     }
     if h != nil {
-        err = h(requestInfo.Headers)
+        err := h(requestInfo.Headers)
         if err != nil {
             return nil, err
         }
     }
     if o != nil {
-        err = requestInfo.AddRequestOptions(o)
+        err := requestInfo.AddRequestOptions(o)
         if err != nil {
             return nil, err
         }
     }
-    return requestInfo, err
+    return requestInfo, nil
 }
 func (m *InferenceClassificationOverrideRequestBuilder) CreatePatchRequestInformation(body *i2bf413bd639f9258700927995a2deeba4c8f0c1344d988e5d8e5959b0bb6f4ce.InferenceClassificationOverride, h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption)(*ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestInformation, error) {
     requestInfo := ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.NewRequestInformation()
-    err := requestInfo.SetUri(m.currentPath, m.pathSegment, m.isRawUrl)
+    requestInfo.UrlTemplate = m.urlTemplate
+    requestInfo.UrlTemplateParameters = m.urlTemplateParameters
     requestInfo.Method = ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.PATCH
-    if err != nil {
-        return nil, err
-    }
     requestInfo.SetContentFromParsable(m.requestAdapter, "application/json", body)
     if h != nil {
-        err = h(requestInfo.Headers)
+        err := h(requestInfo.Headers)
         if err != nil {
             return nil, err
         }
     }
     if o != nil {
-        err = requestInfo.AddRequestOptions(o)
+        err := requestInfo.AddRequestOptions(o)
         if err != nil {
             return nil, err
         }
     }
-    return requestInfo, err
+    return requestInfo, nil
 }
 func (m *InferenceClassificationOverrideRequestBuilder) Delete(h func (value map[string]string) (err error), o []ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.RequestOption, responseHandler *ida96af0f171bb75f894a4013a6b3146a4397c58f11adb81a2b7cbea9314783a9.ResponseHandler)(func() (error)) {
     requestInfo, err := m.CreateDeleteRequestInformation(h, o);