Skip to content

Commit 09bde09

Browse files
committed
address comment
1 parent dbf21bf commit 09bde09

13 files changed

Lines changed: 110 additions & 58 deletions

File tree

src/main/kotlin/com/nylas/resources/Attachments.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Attachments(client: NylasClient) : Resource<Attachment>(client, Attachment
2424
@Throws(NylasOAuthError::class, NylasSdkTimeoutError::class)
2525
@JvmOverloads
2626
fun find(identifier: String, attachmentId: String, queryParams: FindAttachmentQueryParams, overrides: RequestOverrides? = null): Response<Attachment> {
27-
val path = String.format("v3/grants/%s/attachments/%s", identifier, PathEncoder.encode(attachmentId))
27+
val path = String.format("v3/grants/%s/attachments/%s", PathEncoder.encode(identifier), PathEncoder.encode(attachmentId))
2828
return findResourceEncoded(path, queryParams, overrides = overrides)
2929
}
3030

@@ -46,7 +46,7 @@ class Attachments(client: NylasClient) : Resource<Attachment>(client, Attachment
4646
@Throws(NylasOAuthError::class, NylasSdkTimeoutError::class)
4747
@JvmOverloads
4848
fun download(identifier: String, attachmentId: String, queryParams: FindAttachmentQueryParams, overrides: RequestOverrides? = null): ResponseBody {
49-
val path = String.format("v3/grants/%s/attachments/%s/download", identifier, PathEncoder.encode(attachmentId))
49+
val path = String.format("v3/grants/%s/attachments/%s/download", PathEncoder.encode(identifier), PathEncoder.encode(attachmentId))
5050

5151
return client.downloadResponseEncoded(path, queryParams, overrides = overrides)
5252
}

src/main/kotlin/com/nylas/resources/Calendars.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Calendars(client: NylasClient) : Resource<Calendar>(client, Calendar::clas
2626
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
2727
@JvmOverloads
2828
fun list(identifier: String, queryParams: ListCalendersQueryParams? = null, overrides: RequestOverrides? = null): ListResponse<Calendar> {
29-
val path = String.format("v3/grants/%s/calendars", identifier)
29+
val path = String.format("v3/grants/%s/calendars", PathEncoder.encode(identifier))
3030
return listResourceEncoded(path, queryParams, overrides)
3131
}
3232

@@ -40,7 +40,7 @@ class Calendars(client: NylasClient) : Resource<Calendar>(client, Calendar::clas
4040
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
4141
@JvmOverloads
4242
fun find(identifier: String, calendarId: String, overrides: RequestOverrides? = null): Response<Calendar> {
43-
val path = String.format("v3/grants/%s/calendars/%s", identifier, PathEncoder.encode(calendarId))
43+
val path = String.format("v3/grants/%s/calendars/%s", PathEncoder.encode(identifier), PathEncoder.encode(calendarId))
4444
return findResourceEncoded(path, overrides = overrides)
4545
}
4646

@@ -54,7 +54,7 @@ class Calendars(client: NylasClient) : Resource<Calendar>(client, Calendar::clas
5454
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
5555
@JvmOverloads
5656
fun create(identifier: String, requestBody: CreateCalendarRequest, overrides: RequestOverrides? = null): Response<Calendar> {
57-
val path = String.format("v3/grants/%s/calendars", identifier)
57+
val path = String.format("v3/grants/%s/calendars", PathEncoder.encode(identifier))
5858
val adapter = JsonHelper.moshi().adapter(CreateCalendarRequest::class.java)
5959
val serializedRequestBody = adapter.toJson(requestBody)
6060
return createResourceEncoded(path, serializedRequestBody, overrides = overrides)
@@ -71,7 +71,7 @@ class Calendars(client: NylasClient) : Resource<Calendar>(client, Calendar::clas
7171
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
7272
@JvmOverloads
7373
fun update(identifier: String, calendarId: String, requestBody: UpdateCalendarRequest, overrides: RequestOverrides? = null): Response<Calendar> {
74-
val path = String.format("v3/grants/%s/calendars/%s", identifier, PathEncoder.encode(calendarId))
74+
val path = String.format("v3/grants/%s/calendars/%s", PathEncoder.encode(identifier), PathEncoder.encode(calendarId))
7575
val adapter = JsonHelper.moshi().adapter(UpdateCalendarRequest::class.java)
7676
val serializedRequestBody = adapter.toJson(requestBody)
7777
return updateResourceEncoded(path, serializedRequestBody, overrides = overrides)
@@ -86,7 +86,7 @@ class Calendars(client: NylasClient) : Resource<Calendar>(client, Calendar::clas
8686
*/
8787
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
8888
fun destroy(identifier: String, calendarId: String, overrides: RequestOverrides? = null): DeleteResponse {
89-
val path = String.format("v3/grants/%s/calendars/%s", identifier, PathEncoder.encode(calendarId))
89+
val path = String.format("v3/grants/%s/calendars/%s", PathEncoder.encode(identifier), PathEncoder.encode(calendarId))
9090
return destroyResourceEncoded(path, overrides = overrides)
9191
}
9292

@@ -120,7 +120,7 @@ class Calendars(client: NylasClient) : Resource<Calendar>(client, Calendar::clas
120120
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
121121
@JvmOverloads
122122
fun getFreeBusy(identifier: String, request: GetFreeBusyRequest, overrides: RequestOverrides? = null): Response<List<GetFreeBusyResponse>> {
123-
val path = String.format("v3/grants/%s/calendars/free-busy", identifier)
123+
val path = String.format("v3/grants/%s/calendars/free-busy", PathEncoder.encode(identifier))
124124

125125
val serializedRequestBody = JsonHelper.moshi()
126126
.adapter(GetFreeBusyRequest::class.java)

src/main/kotlin/com/nylas/resources/Configurations.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Configurations(client: NylasClient) : Resource<Configuration>(client, Conf
3232
queryParams: ListConfigurationsQueryParams? = null,
3333
overrides: RequestOverrides? = null,
3434
): ListResponse<Configuration> {
35-
val path = String.format("v3/grants/%s/scheduling/configurations", identifier)
35+
val path = String.format("v3/grants/%s/scheduling/configurations", PathEncoder.encode(identifier))
3636
return listResourceEncoded(path, queryParams, overrides)
3737
}
3838

@@ -50,7 +50,7 @@ class Configurations(client: NylasClient) : Resource<Configuration>(client, Conf
5050
configId: String,
5151
overrides: RequestOverrides? = null,
5252
): Response<Configuration> {
53-
val path = String.format("v3/grants/%s/scheduling/configurations/%s", identifier, PathEncoder.encode(configId))
53+
val path = String.format("v3/grants/%s/scheduling/configurations/%s", PathEncoder.encode(identifier), PathEncoder.encode(configId))
5454
return findResourceEncoded(path, overrides = overrides)
5555
}
5656

@@ -68,7 +68,7 @@ class Configurations(client: NylasClient) : Resource<Configuration>(client, Conf
6868
requestBody: CreateConfigurationRequest,
6969
overrides: RequestOverrides? = null,
7070
): Response<Configuration> {
71-
val path = String.format("v3/grants/%s/scheduling/configurations", identifier)
71+
val path = String.format("v3/grants/%s/scheduling/configurations", PathEncoder.encode(identifier))
7272
val adapter = JsonHelper.moshi().adapter(CreateConfigurationRequest::class.java)
7373
val serializedRequestBody = adapter.toJson(requestBody)
7474
return createResourceEncoded(path, serializedRequestBody, overrides = overrides)
@@ -90,7 +90,7 @@ class Configurations(client: NylasClient) : Resource<Configuration>(client, Conf
9090
requestBody: UpdateConfigurationRequest,
9191
overrides: RequestOverrides? = null,
9292
): Response<Configuration> {
93-
val path = String.format("v3/grants/%s/scheduling/configurations/%s", identifier, PathEncoder.encode(configId))
93+
val path = String.format("v3/grants/%s/scheduling/configurations/%s", PathEncoder.encode(identifier), PathEncoder.encode(configId))
9494
val adapter = JsonHelper.moshi().adapter(UpdateConfigurationRequest::class.java)
9595
val serializedRequestBody = adapter.toJson(requestBody)
9696
return updateResourceEncoded(path, serializedRequestBody, overrides = overrides)
@@ -109,7 +109,7 @@ class Configurations(client: NylasClient) : Resource<Configuration>(client, Conf
109109
configId: String,
110110
overrides: RequestOverrides? = null,
111111
): DeleteResponse {
112-
val path = String.format("v3/grants/%s/scheduling/configurations/%s", identifier, PathEncoder.encode(configId))
112+
val path = String.format("v3/grants/%s/scheduling/configurations/%s", PathEncoder.encode(identifier), PathEncoder.encode(configId))
113113
return destroyResourceEncoded(path, overrides = overrides)
114114
}
115115
}

src/main/kotlin/com/nylas/resources/Contacts.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Contacts(client: NylasClient) : Resource<Contact>(client, Contact::class.j
1717
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
1818
@JvmOverloads
1919
fun list(identifier: String, queryParams: ListContactsQueryParams? = null, overrides: RequestOverrides? = null): ListResponse<Contact> {
20-
val path = String.format("v3/grants/%s/contacts", identifier)
20+
val path = String.format("v3/grants/%s/contacts", PathEncoder.encode(identifier))
2121
return listResourceEncoded(path, queryParams, overrides)
2222
}
2323

@@ -32,7 +32,7 @@ class Contacts(client: NylasClient) : Resource<Contact>(client, Contact::class.j
3232
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
3333
@JvmOverloads
3434
fun find(identifier: String, contactId: String, queryParams: FindContactQueryParams? = null, overrides: RequestOverrides? = null): Response<Contact> {
35-
val path = String.format("v3/grants/%s/contacts/%s", identifier, PathEncoder.encode(contactId))
35+
val path = String.format("v3/grants/%s/contacts/%s", PathEncoder.encode(identifier), PathEncoder.encode(contactId))
3636
return findResourceEncoded(path, queryParams, overrides)
3737
}
3838

@@ -46,7 +46,7 @@ class Contacts(client: NylasClient) : Resource<Contact>(client, Contact::class.j
4646
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
4747
@JvmOverloads
4848
fun create(identifier: String, requestBody: CreateContactRequest, overrides: RequestOverrides? = null): Response<Contact> {
49-
val path = String.format("v3/grants/%s/contacts", identifier)
49+
val path = String.format("v3/grants/%s/contacts", PathEncoder.encode(identifier))
5050
val adapter = JsonHelper.moshi().adapter(CreateContactRequest::class.java)
5151
val serializedRequestBody = adapter.toJson(requestBody)
5252
return createResourceEncoded(path, serializedRequestBody, overrides = overrides)
@@ -63,7 +63,7 @@ class Contacts(client: NylasClient) : Resource<Contact>(client, Contact::class.j
6363
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
6464
@JvmOverloads
6565
fun update(identifier: String, contactId: String, requestBody: UpdateContactRequest, overrides: RequestOverrides? = null): Response<Contact> {
66-
val path = String.format("v3/grants/%s/contacts/%s", identifier, PathEncoder.encode(contactId))
66+
val path = String.format("v3/grants/%s/contacts/%s", PathEncoder.encode(identifier), PathEncoder.encode(contactId))
6767
val adapter = JsonHelper.moshi().adapter(UpdateContactRequest::class.java)
6868
val serializedRequestBody = adapter.toJson(requestBody)
6969
return updateResourceEncoded(path, serializedRequestBody, overrides = overrides)
@@ -79,7 +79,7 @@ class Contacts(client: NylasClient) : Resource<Contact>(client, Contact::class.j
7979
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
8080
@JvmOverloads
8181
fun destroy(identifier: String, contactId: String, overrides: RequestOverrides? = null): DeleteResponse {
82-
val path = String.format("v3/grants/%s/contacts/%s", identifier, PathEncoder.encode(contactId))
82+
val path = String.format("v3/grants/%s/contacts/%s", PathEncoder.encode(identifier), PathEncoder.encode(contactId))
8383
return destroyResourceEncoded(path, overrides = overrides)
8484
}
8585

@@ -93,7 +93,7 @@ class Contacts(client: NylasClient) : Resource<Contact>(client, Contact::class.j
9393
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
9494
@JvmOverloads
9595
fun listGroups(identifier: String, queryParams: ListContactGroupsQueryParams? = null, overrides: RequestOverrides? = null): ListResponse<ContactGroup> {
96-
val path = String.format("v3/grants/%s/contacts/groups", identifier)
96+
val path = String.format("v3/grants/%s/contacts/groups", PathEncoder.encode(identifier))
9797
val responseType = Types.newParameterizedType(ListResponse::class.java, ContactGroup::class.java)
9898
return client.executeGetEncoded(path, responseType, queryParams, overrides)
9999
}

src/main/kotlin/com/nylas/resources/Domains.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Domains(client: NylasClient) : Resource<Message>(client, Message::class.ja
5353
requestBody: SendTransactionalEmailRequest,
5454
overrides: RequestOverrides? = null,
5555
): Response<Message> {
56-
val path = String.format("v3/domains/%s/messages/send", domainName)
56+
val path = String.format("v3/domains/%s/messages/send", PathEncoder.encode(domainName))
5757
val responseType = Types.newParameterizedType(Response::class.java, Message::class.java)
5858
val adapter = JsonHelper.moshi().adapter(SendTransactionalEmailRequest::class.java)
5959

src/main/kotlin/com/nylas/resources/Drafts.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Drafts(client: NylasClient) : Resource<Draft>(client, Draft::class.java) {
1818
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
1919
@JvmOverloads
2020
fun list(identifier: String, queryParams: ListDraftsQueryParams? = null, overrides: RequestOverrides? = null): ListResponse<Draft> {
21-
val path = String.format("v3/grants/%s/drafts", identifier)
21+
val path = String.format("v3/grants/%s/drafts", PathEncoder.encode(identifier))
2222
return listResourceEncoded(path, queryParams, overrides)
2323
}
2424

@@ -32,7 +32,7 @@ class Drafts(client: NylasClient) : Resource<Draft>(client, Draft::class.java) {
3232
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
3333
@JvmOverloads
3434
fun find(identifier: String, draftId: String, overrides: RequestOverrides? = null): Response<Draft> {
35-
val path = String.format("v3/grants/%s/drafts/%s", identifier, PathEncoder.encode(draftId))
35+
val path = String.format("v3/grants/%s/drafts/%s", PathEncoder.encode(identifier), PathEncoder.encode(draftId))
3636
return findResourceEncoded(path, overrides = overrides)
3737
}
3838

@@ -46,7 +46,7 @@ class Drafts(client: NylasClient) : Resource<Draft>(client, Draft::class.java) {
4646
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
4747
@JvmOverloads
4848
fun create(identifier: String, requestBody: CreateDraftRequest, overrides: RequestOverrides? = null): Response<Draft> {
49-
val path = String.format("v3/grants/%s/drafts", identifier)
49+
val path = String.format("v3/grants/%s/drafts", PathEncoder.encode(identifier))
5050
val responseType = Types.newParameterizedType(Response::class.java, Draft::class.java)
5151
val adapter = JsonHelper.moshi().adapter(CreateDraftRequest::class.java)
5252

@@ -76,7 +76,7 @@ class Drafts(client: NylasClient) : Resource<Draft>(client, Draft::class.java) {
7676
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
7777
@JvmOverloads
7878
fun update(identifier: String, draftId: String, requestBody: UpdateDraftRequest, overrides: RequestOverrides? = null): Response<Draft> {
79-
val path = String.format("v3/grants/%s/drafts/%s", identifier, PathEncoder.encode(draftId))
79+
val path = String.format("v3/grants/%s/drafts/%s", PathEncoder.encode(identifier), PathEncoder.encode(draftId))
8080
val responseType = Types.newParameterizedType(Response::class.java, Draft::class.java)
8181
val adapter = JsonHelper.moshi().adapter(UpdateDraftRequest::class.java)
8282

@@ -105,7 +105,7 @@ class Drafts(client: NylasClient) : Resource<Draft>(client, Draft::class.java) {
105105
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
106106
@JvmOverloads
107107
fun destroy(identifier: String, draftId: String, overrides: RequestOverrides? = null): DeleteResponse {
108-
val path = String.format("v3/grants/%s/drafts/%s", identifier, PathEncoder.encode(draftId))
108+
val path = String.format("v3/grants/%s/drafts/%s", PathEncoder.encode(identifier), PathEncoder.encode(draftId))
109109
return destroyResourceEncoded(path, overrides = overrides)
110110
}
111111

@@ -119,7 +119,7 @@ class Drafts(client: NylasClient) : Resource<Draft>(client, Draft::class.java) {
119119
@Throws(NylasApiError::class, NylasSdkTimeoutError::class)
120120
@JvmOverloads
121121
fun send(identifier: String, draftId: String, overrides: RequestOverrides? = null): Response<Message> {
122-
val path = String.format("v3/grants/%s/drafts/%s", identifier, PathEncoder.encode(draftId))
122+
val path = String.format("v3/grants/%s/drafts/%s", PathEncoder.encode(identifier), PathEncoder.encode(draftId))
123123
val responseType = Types.newParameterizedType(Response::class.java, Message::class.java)
124124
return client.executePostEncoded(path, responseType, overrides = overrides)
125125
}

0 commit comments

Comments
 (0)