diff --git a/client/docs/Application.md b/client/docs/Application.md index dc6909f..00abef6 100644 --- a/client/docs/Application.md +++ b/client/docs/Application.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **description** | **String** | The description of the application. | -**id** | **Integer** | The application id. | +**id** | **Long** | The application id. | **image** | **String** | The image of the application. | **internal** | **Boolean** | Whether the application is an internal application. Internal applications should not be deleted. | **name** | **String** | The application name. This is how the application should be displayed to the user. | diff --git a/client/docs/ApplicationApi.md b/client/docs/ApplicationApi.md index d094ccb..4ac61b0 100644 --- a/client/docs/ApplicationApi.md +++ b/client/docs/ApplicationApi.md @@ -110,7 +110,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); ApplicationApi apiInstance = new ApplicationApi(); -Integer id = 56; // Integer | the application id +Long id = 789L; // Long | the application id try { Void result = apiInstance.deleteApp(id); System.out.println(result); @@ -124,7 +124,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the application id | + **id** | **Long**| the application id | ### Return type @@ -235,7 +235,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); ApplicationApi apiInstance = new ApplicationApi(); Application body = new Application(); // Application | the application to update -Integer id = 56; // Integer | the application id +Long id = 789L; // Long | the application id try { Application result = apiInstance.updateApplication(body, id); System.out.println(result); @@ -250,7 +250,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **body** | [**Application**](Application.md)| the application to update | - **id** | **Integer**| the application id | + **id** | **Long**| the application id | ### Return type @@ -301,7 +301,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); ApplicationApi apiInstance = new ApplicationApi(); File file = new File("/path/to/file.txt"); // File | the application image -Integer id = 56; // Integer | the application id +Long id = 789L; // Long | the application id try { Application result = apiInstance.uploadAppImage(file, id); System.out.println(result); @@ -316,7 +316,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **file** | **File**| the application image | - **id** | **Integer**| the application id | + **id** | **Long**| the application id | ### Return type diff --git a/client/docs/Client.md b/client/docs/Client.md index d562678..3de1e6c 100644 --- a/client/docs/Client.md +++ b/client/docs/Client.md @@ -4,7 +4,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**id** | **Integer** | The client id. | +**id** | **Long** | The client id. | **name** | **String** | The client name. This is how the client should be displayed to the user. | **token** | **String** | The client token. Can be used as `clientToken`. See Authentication. | diff --git a/client/docs/ClientApi.md b/client/docs/ClientApi.md index 2d1f8c7..aee74ad 100644 --- a/client/docs/ClientApi.md +++ b/client/docs/ClientApi.md @@ -7,6 +7,7 @@ Method | HTTP request | Description [**createClient**](ClientApi.md#createClient) | **POST** client | Create a client. [**deleteClient**](ClientApi.md#deleteClient) | **DELETE** client/{id} | Delete a client. [**getClients**](ClientApi.md#getClients) | **GET** client | Return all clients. +[**updateClient**](ClientApi.md#updateClient) | **PUT** client/{id} | Update a client. @@ -108,7 +109,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); ClientApi apiInstance = new ClientApi(); -Integer id = 56; // Integer | the client id +Long id = 789L; // Long | the client id try { Void result = apiInstance.deleteClient(id); System.out.println(result); @@ -122,7 +123,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the client id | + **id** | **Long**| the client id | ### Return type @@ -197,3 +198,69 @@ This endpoint does not need any parameter. - **Content-Type**: application/json - **Accept**: application/json + +# **updateClient** +> Client updateClient(body, id) + +Update a client. + +### Example +```java +// Import classes: +//import com.github.gotify.client.ApiClient; +//import com.github.gotify.client.ApiException; +//import com.github.gotify.client.Configuration; +//import com.github.gotify.client.auth.*; +//import com.github.gotify.client.api.ClientApi; + +ApiClient defaultClient = Configuration.getDefaultApiClient(); + +// Configure HTTP basic authorization: basicAuth +HttpBasicAuth basicAuth = (HttpBasicAuth) defaultClient.getAuthentication("basicAuth"); +basicAuth.setUsername("YOUR USERNAME"); +basicAuth.setPassword("YOUR PASSWORD"); + +// Configure API key authorization: clientTokenHeader +ApiKeyAuth clientTokenHeader = (ApiKeyAuth) defaultClient.getAuthentication("clientTokenHeader"); +clientTokenHeader.setApiKey("YOUR API KEY"); +// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) +//clientTokenHeader.setApiKeyPrefix("Token"); + +// Configure API key authorization: clientTokenQuery +ApiKeyAuth clientTokenQuery = (ApiKeyAuth) defaultClient.getAuthentication("clientTokenQuery"); +clientTokenQuery.setApiKey("YOUR API KEY"); +// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) +//clientTokenQuery.setApiKeyPrefix("Token"); + +ClientApi apiInstance = new ClientApi(); +Client body = new Client(); // Client | the client to update +Long id = 789L; // Long | the client id +try { + Client result = apiInstance.updateClient(body, id); + System.out.println(result); +} catch (ApiException e) { + System.err.println("Exception when calling ClientApi#updateClient"); + e.printStackTrace(); +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **body** | [**Client**](Client.md)| the client to update | + **id** | **Long**| the client id | + +### Return type + +[**Client**](Client.md) + +### Authorization + +[basicAuth](../README.md#basicAuth), [clientTokenHeader](../README.md#clientTokenHeader), [clientTokenQuery](../README.md#clientTokenQuery) + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: application/json + diff --git a/client/docs/Health.md b/client/docs/Health.md new file mode 100644 index 0000000..e6181a2 --- /dev/null +++ b/client/docs/Health.md @@ -0,0 +1,11 @@ + +# Health + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**database** | **String** | The health of the database connection. | +**health** | **String** | The health of the overall application. | + + + diff --git a/client/docs/HealthApi.md b/client/docs/HealthApi.md new file mode 100644 index 0000000..0fbd9e5 --- /dev/null +++ b/client/docs/HealthApi.md @@ -0,0 +1,48 @@ +# HealthApi + +All URIs are relative to *http://localhost* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**getHealth**](HealthApi.md#getHealth) | **GET** health | Get health information. + + + +# **getHealth** +> Health getHealth() + +Get health information. + +### Example +```java +// Import classes: +//import com.github.gotify.client.ApiException; +//import com.github.gotify.client.api.HealthApi; + + +HealthApi apiInstance = new HealthApi(); +try { + Health result = apiInstance.getHealth(); + System.out.println(result); +} catch (ApiException e) { + System.err.println("Exception when calling HealthApi#getHealth"); + e.printStackTrace(); +} +``` + +### Parameters +This endpoint does not need any parameter. + +### Return type + +[**Health**](Health.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: application/json + diff --git a/client/docs/Message.md b/client/docs/Message.md index e5baed9..64caad4 100644 --- a/client/docs/Message.md +++ b/client/docs/Message.md @@ -4,11 +4,11 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**appid** | **Integer** | The application id that send this message. | +**appid** | **Long** | The application id that send this message. | **date** | [**OffsetDateTime**](OffsetDateTime.md) | The date the message was created. | **extras** | **Map<String, Object>** | The extra data sent along the message. The extra fields are stored in a key-value scheme. Only accepted in CreateMessage requests with application/json content-type. The keys should be in the following format: &lt;top-namespace&gt;::[&lt;sub-namespace&gt;::]&lt;action&gt; These namespaces are reserved and might be used in the official clients: gotify android ios web server client. Do not use them for other purposes. | [optional] -**id** | **Integer** | The message id. | -**message** | **String** | The actual message. | +**id** | **Long** | The message id. | +**message** | **String** | The message. Markdown (excluding html) is allowed. | **priority** | **Long** | The priority of the message. | [optional] **title** | **String** | The title of the message. | [optional] diff --git a/client/docs/MessageApi.md b/client/docs/MessageApi.md index 22e8c03..5f19cb4 100644 --- a/client/docs/MessageApi.md +++ b/client/docs/MessageApi.md @@ -109,7 +109,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); MessageApi apiInstance = new MessageApi(); -Integer id = 56; // Integer | the application id +Long id = 789L; // Long | the application id try { Void result = apiInstance.deleteAppMessages(id); System.out.println(result); @@ -123,7 +123,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the application id | + **id** | **Long**| the application id | ### Return type @@ -173,7 +173,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); MessageApi apiInstance = new MessageApi(); -Integer id = 56; // Integer | the message id +Long id = 789L; // Long | the message id try { Void result = apiInstance.deleteMessage(id); System.out.println(result); @@ -187,7 +187,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the message id | + **id** | **Long**| the message id | ### Return type @@ -297,9 +297,9 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); MessageApi apiInstance = new MessageApi(); -Integer id = 56; // Integer | the application id +Long id = 789L; // Long | the application id Integer limit = 100; // Integer | the maximal amount of messages to return -Integer since = 56; // Integer | return all messages with an ID less than this value +Long since = 789L; // Long | return all messages with an ID less than this value try { PagedMessages result = apiInstance.getAppMessages(id, limit, since); System.out.println(result); @@ -313,9 +313,9 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the application id | + **id** | **Long**| the application id | **limit** | **Integer**| the maximal amount of messages to return | [optional] [default to 100] - **since** | **Integer**| return all messages with an ID less than this value | [optional] + **since** | **Long**| return all messages with an ID less than this value | [optional] ### Return type @@ -366,7 +366,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); MessageApi apiInstance = new MessageApi(); Integer limit = 100; // Integer | the maximal amount of messages to return -Integer since = 56; // Integer | return all messages with an ID less than this value +Long since = 789L; // Long | return all messages with an ID less than this value try { PagedMessages result = apiInstance.getMessages(limit, since); System.out.println(result); @@ -381,7 +381,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **limit** | **Integer**| the maximal amount of messages to return | [optional] [default to 100] - **since** | **Integer**| return all messages with an ID less than this value | [optional] + **since** | **Long**| return all messages with an ID less than this value | [optional] ### Return type diff --git a/client/docs/Paging.md b/client/docs/Paging.md index 37ca059..ef1a360 100644 --- a/client/docs/Paging.md +++ b/client/docs/Paging.md @@ -6,7 +6,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **limit** | **Long** | The limit of the messages for the current request. | **next** | **String** | The request url for the next page. Empty/Null when no next page is available. | [optional] -**since** | **Integer** | The ID of the last message returned in the current request. Use this as alternative to the next link. | +**since** | **Long** | The ID of the last message returned in the current request. Use this as alternative to the next link. | **size** | **Long** | The amount of messages that got returned in the current request. | diff --git a/client/docs/PluginApi.md b/client/docs/PluginApi.md index 0aa3544..f52d235 100644 --- a/client/docs/PluginApi.md +++ b/client/docs/PluginApi.md @@ -47,7 +47,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); PluginApi apiInstance = new PluginApi(); -Integer id = 56; // Integer | the plugin id +Long id = 789L; // Long | the plugin id try { Void result = apiInstance.disablePlugin(id); System.out.println(result); @@ -61,7 +61,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the plugin id | + **id** | **Long**| the plugin id | ### Return type @@ -111,7 +111,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); PluginApi apiInstance = new PluginApi(); -Integer id = 56; // Integer | the plugin id +Long id = 789L; // Long | the plugin id try { Void result = apiInstance.enablePlugin(id); System.out.println(result); @@ -125,7 +125,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the plugin id | + **id** | **Long**| the plugin id | ### Return type @@ -175,7 +175,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); PluginApi apiInstance = new PluginApi(); -Integer id = 56; // Integer | the plugin id +Long id = 789L; // Long | the plugin id try { Object result = apiInstance.getPluginConfig(id); System.out.println(result); @@ -189,7 +189,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the plugin id | + **id** | **Long**| the plugin id | ### Return type @@ -239,7 +239,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); PluginApi apiInstance = new PluginApi(); -Integer id = 56; // Integer | the plugin id +Long id = 789L; // Long | the plugin id try { String result = apiInstance.getPluginDisplay(id); System.out.println(result); @@ -253,7 +253,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the plugin id | + **id** | **Long**| the plugin id | ### Return type @@ -363,7 +363,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); PluginApi apiInstance = new PluginApi(); -Integer id = 56; // Integer | the plugin id +Long id = 789L; // Long | the plugin id try { Void result = apiInstance.updatePluginConfig(id); System.out.println(result); @@ -377,7 +377,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the plugin id | + **id** | **Long**| the plugin id | ### Return type diff --git a/client/docs/PluginConf.md b/client/docs/PluginConf.md index 0a78fb1..daecd72 100644 --- a/client/docs/PluginConf.md +++ b/client/docs/PluginConf.md @@ -7,7 +7,7 @@ Name | Type | Description | Notes **author** | **String** | The author of the plugin. | [optional] **capabilities** | **List<String>** | Capabilities the plugin provides | **enabled** | **Boolean** | Whether the plugin instance is enabled. | -**id** | **Integer** | The plugin id. | +**id** | **Long** | The plugin id. | **license** | **String** | The license of the plugin. | [optional] **modulePath** | **String** | The module path of the plugin. | **name** | **String** | The plugin name. | diff --git a/client/docs/User.md b/client/docs/User.md index 431c4c7..34b372c 100644 --- a/client/docs/User.md +++ b/client/docs/User.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **admin** | **Boolean** | If the user is an administrator. | [optional] -**id** | **Integer** | The user id. | +**id** | **Long** | The user id. | **name** | **String** | The user name. For login. | diff --git a/client/docs/UserApi.md b/client/docs/UserApi.md index 3d8fd33..2305bba 100644 --- a/client/docs/UserApi.md +++ b/client/docs/UserApi.md @@ -172,7 +172,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); UserApi apiInstance = new UserApi(); -Integer id = 56; // Integer | the user id +Long id = 789L; // Long | the user id try { Void result = apiInstance.deleteUser(id); System.out.println(result); @@ -186,7 +186,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the user id | + **id** | **Long**| the user id | ### Return type @@ -236,7 +236,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); UserApi apiInstance = new UserApi(); -Integer id = 56; // Integer | the user id +Long id = 789L; // Long | the user id try { User result = apiInstance.getUser(id); System.out.println(result); @@ -250,7 +250,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the user id | + **id** | **Long**| the user id | ### Return type @@ -424,7 +424,7 @@ clientTokenQuery.setApiKey("YOUR API KEY"); //clientTokenQuery.setApiKeyPrefix("Token"); UserApi apiInstance = new UserApi(); -Integer id = 56; // Integer | the user id +Long id = 789L; // Long | the user id UserWithPass body = new UserWithPass(); // UserWithPass | the updated user try { User result = apiInstance.updateUser(id, body); @@ -439,7 +439,7 @@ try { Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- - **id** | **Integer**| the user id | + **id** | **Long**| the user id | **body** | [**UserWithPass**](UserWithPass.md)| the updated user | ### Return type diff --git a/client/docs/UserWithPass.md b/client/docs/UserWithPass.md index ad34a03..2a24912 100644 --- a/client/docs/UserWithPass.md +++ b/client/docs/UserWithPass.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **admin** | **Boolean** | If the user is an administrator. | [optional] -**id** | **Integer** | The user id. | +**id** | **Long** | The user id. | **name** | **String** | The user name. For login. | **pass** | **String** | The user password. For login. | diff --git a/client/src/main/java/com/github/gotify/client/JSON.java b/client/src/main/java/com/github/gotify/client/JSON.java index 918b320..fdd1edb 100644 --- a/client/src/main/java/com/github/gotify/client/JSON.java +++ b/client/src/main/java/com/github/gotify/client/JSON.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. diff --git a/client/src/main/java/com/github/gotify/client/StringUtil.java b/client/src/main/java/com/github/gotify/client/StringUtil.java index c042ca5..b4f7158 100644 --- a/client/src/main/java/com/github/gotify/client/StringUtil.java +++ b/client/src/main/java/com/github/gotify/client/StringUtil.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -13,7 +13,7 @@ package com.github.gotify.client; -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). diff --git a/client/src/main/java/com/github/gotify/client/api/ApplicationApi.java b/client/src/main/java/com/github/gotify/client/api/ApplicationApi.java index 375e6ff..2a7de1c 100644 --- a/client/src/main/java/com/github/gotify/client/api/ApplicationApi.java +++ b/client/src/main/java/com/github/gotify/client/api/ApplicationApi.java @@ -43,7 +43,7 @@ public interface ApplicationApi { }) @DELETE("application/{id}") Call deleteApp( - @retrofit2.http.Path("id") Integer id + @retrofit2.http.Path("id") Long id ); /** @@ -70,7 +70,7 @@ public interface ApplicationApi { }) @PUT("application/{id}") Call updateApplication( - @retrofit2.http.Body Application body, @retrofit2.http.Path("id") Integer id + @retrofit2.http.Body Application body, @retrofit2.http.Path("id") Long id ); /** @@ -83,7 +83,7 @@ public interface ApplicationApi { @retrofit2.http.Multipart @POST("application/{id}/image") Call uploadAppImage( - @retrofit2.http.Part("file\"; filename=\"file") RequestBody file, @retrofit2.http.Path("id") Integer id + @retrofit2.http.Part("file\"; filename=\"file") RequestBody file, @retrofit2.http.Path("id") Long id ); } diff --git a/client/src/main/java/com/github/gotify/client/api/ClientApi.java b/client/src/main/java/com/github/gotify/client/api/ClientApi.java index 71cb1b6..3da8dda 100644 --- a/client/src/main/java/com/github/gotify/client/api/ClientApi.java +++ b/client/src/main/java/com/github/gotify/client/api/ClientApi.java @@ -42,7 +42,7 @@ public interface ClientApi { }) @DELETE("client/{id}") Call deleteClient( - @retrofit2.http.Path("id") Integer id + @retrofit2.http.Path("id") Long id ); /** @@ -57,4 +57,19 @@ public interface ClientApi { Call> getClients(); + /** + * Update a client. + * + * @param body the client to update (required) + * @param id the client id (required) + * @return Call<Client> + */ + @Headers({ + "Content-Type:application/json" + }) + @PUT("client/{id}") + Call updateClient( + @retrofit2.http.Body Client body, @retrofit2.http.Path("id") Long id + ); + } diff --git a/client/src/main/java/com/github/gotify/client/api/HealthApi.java b/client/src/main/java/com/github/gotify/client/api/HealthApi.java new file mode 100644 index 0000000..38a37a9 --- /dev/null +++ b/client/src/main/java/com/github/gotify/client/api/HealthApi.java @@ -0,0 +1,31 @@ +package com.github.gotify.client.api; + +import com.github.gotify.client.CollectionFormats.*; + +import retrofit2.Call; +import retrofit2.http.*; + +import okhttp3.RequestBody; +import okhttp3.ResponseBody; + +import com.github.gotify.client.model.Health; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public interface HealthApi { + /** + * Get health information. + * + * @return Call<Health> + */ + @Headers({ + "Content-Type:application/json" + }) + @GET("health") + Call getHealth(); + + +} diff --git a/client/src/main/java/com/github/gotify/client/api/MessageApi.java b/client/src/main/java/com/github/gotify/client/api/MessageApi.java index 60df793..8e54861 100644 --- a/client/src/main/java/com/github/gotify/client/api/MessageApi.java +++ b/client/src/main/java/com/github/gotify/client/api/MessageApi.java @@ -43,7 +43,7 @@ public interface MessageApi { }) @DELETE("application/{id}/message") Call deleteAppMessages( - @retrofit2.http.Path("id") Integer id + @retrofit2.http.Path("id") Long id ); /** @@ -57,7 +57,7 @@ public interface MessageApi { }) @DELETE("message/{id}") Call deleteMessage( - @retrofit2.http.Path("id") Integer id + @retrofit2.http.Path("id") Long id ); /** @@ -85,7 +85,7 @@ public interface MessageApi { }) @GET("application/{id}/message") Call getAppMessages( - @retrofit2.http.Path("id") Integer id, @retrofit2.http.Query("limit") Integer limit, @retrofit2.http.Query("since") Integer since + @retrofit2.http.Path("id") Long id, @retrofit2.http.Query("limit") Integer limit, @retrofit2.http.Query("since") Long since ); /** @@ -100,7 +100,7 @@ public interface MessageApi { }) @GET("message") Call getMessages( - @retrofit2.http.Query("limit") Integer limit, @retrofit2.http.Query("since") Integer since + @retrofit2.http.Query("limit") Integer limit, @retrofit2.http.Query("since") Long since ); /** diff --git a/client/src/main/java/com/github/gotify/client/api/PluginApi.java b/client/src/main/java/com/github/gotify/client/api/PluginApi.java index b144706..ed54908 100644 --- a/client/src/main/java/com/github/gotify/client/api/PluginApi.java +++ b/client/src/main/java/com/github/gotify/client/api/PluginApi.java @@ -28,7 +28,7 @@ public interface PluginApi { }) @POST("plugin/{id}/disable") Call disablePlugin( - @retrofit2.http.Path("id") Integer id + @retrofit2.http.Path("id") Long id ); /** @@ -42,7 +42,7 @@ public interface PluginApi { }) @POST("plugin/{id}/enable") Call enablePlugin( - @retrofit2.http.Path("id") Integer id + @retrofit2.http.Path("id") Long id ); /** @@ -56,7 +56,7 @@ public interface PluginApi { }) @GET("plugin/{id}/config") Call getPluginConfig( - @retrofit2.http.Path("id") Integer id + @retrofit2.http.Path("id") Long id ); /** @@ -70,7 +70,7 @@ public interface PluginApi { }) @GET("plugin/{id}/display") Call getPluginDisplay( - @retrofit2.http.Path("id") Integer id + @retrofit2.http.Path("id") Long id ); /** @@ -96,7 +96,7 @@ public interface PluginApi { }) @POST("plugin/{id}/config") Call updatePluginConfig( - @retrofit2.http.Path("id") Integer id + @retrofit2.http.Path("id") Long id ); } diff --git a/client/src/main/java/com/github/gotify/client/api/UserApi.java b/client/src/main/java/com/github/gotify/client/api/UserApi.java index cd598f4..33aae21 100644 --- a/client/src/main/java/com/github/gotify/client/api/UserApi.java +++ b/client/src/main/java/com/github/gotify/client/api/UserApi.java @@ -56,7 +56,7 @@ public interface UserApi { }) @DELETE("user/{id}") Call deleteUser( - @retrofit2.http.Path("id") Integer id + @retrofit2.http.Path("id") Long id ); /** @@ -70,7 +70,7 @@ public interface UserApi { }) @GET("user/{id}") Call getUser( - @retrofit2.http.Path("id") Integer id + @retrofit2.http.Path("id") Long id ); /** @@ -111,7 +111,7 @@ public interface UserApi { }) @POST("user/{id}") Call updateUser( - @retrofit2.http.Path("id") Integer id, @retrofit2.http.Body UserWithPass body + @retrofit2.http.Path("id") Long id, @retrofit2.http.Body UserWithPass body ); } diff --git a/client/src/main/java/com/github/gotify/client/auth/OAuthFlow.java b/client/src/main/java/com/github/gotify/client/auth/OAuthFlow.java index 1db007e..922a997 100644 --- a/client/src/main/java/com/github/gotify/client/auth/OAuthFlow.java +++ b/client/src/main/java/com/github/gotify/client/auth/OAuthFlow.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. diff --git a/client/src/main/java/com/github/gotify/client/model/Application.java b/client/src/main/java/com/github/gotify/client/model/Application.java index fad9100..4087283 100644 --- a/client/src/main/java/com/github/gotify/client/model/Application.java +++ b/client/src/main/java/com/github/gotify/client/model/Application.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -27,13 +27,13 @@ import java.io.IOException; * The Application holds information about an app which can send notifications. */ @ApiModel(description = "The Application holds information about an app which can send notifications.") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class Application { @SerializedName("description") private String description = null; @SerializedName("id") - private Integer id = null; + private Long id = null; @SerializedName("image") private String image = null; @@ -70,7 +70,7 @@ public class Application { * @return id **/ @ApiModelProperty(example = "5", required = true, value = "The application id.") - public Integer getId() { + public Long getId() { return id; } diff --git a/client/src/main/java/com/github/gotify/client/model/Client.java b/client/src/main/java/com/github/gotify/client/model/Client.java index 21f9988..a01090a 100644 --- a/client/src/main/java/com/github/gotify/client/model/Client.java +++ b/client/src/main/java/com/github/gotify/client/model/Client.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -27,10 +27,10 @@ import java.io.IOException; * The Client holds information about a device which can receive notifications (and other stuff). */ @ApiModel(description = "The Client holds information about a device which can receive notifications (and other stuff).") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class Client { @SerializedName("id") - private Integer id = null; + private Long id = null; @SerializedName("name") private String name = null; @@ -43,7 +43,7 @@ public class Client { * @return id **/ @ApiModelProperty(example = "5", required = true, value = "The client id.") - public Integer getId() { + public Long getId() { return id; } diff --git a/client/src/main/java/com/github/gotify/client/model/Error.java b/client/src/main/java/com/github/gotify/client/model/Error.java index c77a7c8..a4ab45a 100644 --- a/client/src/main/java/com/github/gotify/client/model/Error.java +++ b/client/src/main/java/com/github/gotify/client/model/Error.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -27,7 +27,7 @@ import java.io.IOException; * The Error contains error relevant information. */ @ApiModel(description = "The Error contains error relevant information.") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class Error { @SerializedName("error") private String error = null; diff --git a/client/src/main/java/com/github/gotify/client/model/Health.java b/client/src/main/java/com/github/gotify/client/model/Health.java new file mode 100644 index 0000000..9e9834b --- /dev/null +++ b/client/src/main/java/com/github/gotify/client/model/Health.java @@ -0,0 +1,117 @@ +/* + * Gotify REST-API. + * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) + * + * OpenAPI spec version: 2.0.1 + * + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + +package com.github.gotify.client.model; + +import java.util.Objects; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.IOException; + +/** + * Health represents how healthy the application is. + */ +@ApiModel(description = "Health represents how healthy the application is.") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") +public class Health { + @SerializedName("database") + private String database = null; + + @SerializedName("health") + private String health = null; + + public Health database(String database) { + this.database = database; + return this; + } + + /** + * The health of the database connection. + * @return database + **/ + @ApiModelProperty(example = "green", required = true, value = "The health of the database connection.") + public String getDatabase() { + return database; + } + + public void setDatabase(String database) { + this.database = database; + } + + public Health health(String health) { + this.health = health; + return this; + } + + /** + * The health of the overall application. + * @return health + **/ + @ApiModelProperty(example = "green", required = true, value = "The health of the overall application.") + public String getHealth() { + return health; + } + + public void setHealth(String health) { + this.health = health; + } + + + @Override + public boolean equals(java.lang.Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Health health = (Health) o; + return Objects.equals(this.database, health.database) && + Objects.equals(this.health, health.health); + } + + @Override + public int hashCode() { + return Objects.hash(database, health); + } + + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Health {\n"); + + sb.append(" database: ").append(toIndentedString(database)).append("\n"); + sb.append(" health: ").append(toIndentedString(health)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/client/src/main/java/com/github/gotify/client/model/Message.java b/client/src/main/java/com/github/gotify/client/model/Message.java index eab6a97..a7b4e08 100644 --- a/client/src/main/java/com/github/gotify/client/model/Message.java +++ b/client/src/main/java/com/github/gotify/client/model/Message.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -31,10 +31,10 @@ import org.threeten.bp.OffsetDateTime; * The MessageExternal holds information about a message which was sent by an Application. */ @ApiModel(description = "The MessageExternal holds information about a message which was sent by an Application.") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class Message { @SerializedName("appid") - private Integer appid = null; + private Long appid = null; @SerializedName("date") private OffsetDateTime date = null; @@ -43,7 +43,7 @@ public class Message { private Map extras = null; @SerializedName("id") - private Integer id = null; + private Long id = null; @SerializedName("message") private String message = null; @@ -59,7 +59,7 @@ public class Message { * @return appid **/ @ApiModelProperty(example = "5", required = true, value = "The application id that send this message.") - public Integer getAppid() { + public Long getAppid() { return appid; } @@ -103,7 +103,7 @@ public class Message { * @return id **/ @ApiModelProperty(example = "25", required = true, value = "The message id.") - public Integer getId() { + public Long getId() { return id; } @@ -113,10 +113,10 @@ public class Message { } /** - * The actual message. + * The message. Markdown (excluding html) is allowed. * @return message **/ - @ApiModelProperty(example = "Backup was successfully finished.", required = true, value = "The actual message.") + @ApiModelProperty(example = "**Backup** was successfully finished.", required = true, value = "The message. Markdown (excluding html) is allowed.") public String getMessage() { return message; } diff --git a/client/src/main/java/com/github/gotify/client/model/PagedMessages.java b/client/src/main/java/com/github/gotify/client/model/PagedMessages.java index cf8fe4b..ff4a25b 100644 --- a/client/src/main/java/com/github/gotify/client/model/PagedMessages.java +++ b/client/src/main/java/com/github/gotify/client/model/PagedMessages.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -31,7 +31,7 @@ import java.util.List; * Wrapper for the paging and the messages */ @ApiModel(description = "Wrapper for the paging and the messages") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class PagedMessages { @SerializedName("messages") private List messages = new ArrayList(); diff --git a/client/src/main/java/com/github/gotify/client/model/Paging.java b/client/src/main/java/com/github/gotify/client/model/Paging.java index 7a475b6..60b9051 100644 --- a/client/src/main/java/com/github/gotify/client/model/Paging.java +++ b/client/src/main/java/com/github/gotify/client/model/Paging.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -24,10 +24,10 @@ import io.swagger.annotations.ApiModelProperty; import java.io.IOException; /** - * The Paging holds holds information about the limit and making requests to the next page. + * The Paging holds information about the limit and making requests to the next page. */ -@ApiModel(description = "The Paging holds holds information about the limit and making requests to the next page.") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@ApiModel(description = "The Paging holds information about the limit and making requests to the next page.") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class Paging { @SerializedName("limit") private Long limit = null; @@ -36,7 +36,7 @@ public class Paging { private String next = null; @SerializedName("since") - private Integer since = null; + private Long since = null; @SerializedName("size") private Long size = null; @@ -67,7 +67,7 @@ public class Paging { * @return since **/ @ApiModelProperty(example = "5", required = true, value = "The ID of the last message returned in the current request. Use this as alternative to the next link.") - public Integer getSince() { + public Long getSince() { return since; } diff --git a/client/src/main/java/com/github/gotify/client/model/PluginConf.java b/client/src/main/java/com/github/gotify/client/model/PluginConf.java index e486fca..fc51445 100644 --- a/client/src/main/java/com/github/gotify/client/model/PluginConf.java +++ b/client/src/main/java/com/github/gotify/client/model/PluginConf.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -29,7 +29,7 @@ import java.util.List; * Holds information about a plugin instance for one user. */ @ApiModel(description = "Holds information about a plugin instance for one user.") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class PluginConf { @SerializedName("author") private String author = null; @@ -41,7 +41,7 @@ public class PluginConf { private Boolean enabled = null; @SerializedName("id") - private Integer id = null; + private Long id = null; @SerializedName("license") private String license = null; @@ -113,7 +113,7 @@ public class PluginConf { * @return id **/ @ApiModelProperty(example = "25", required = true, value = "The plugin id.") - public Integer getId() { + public Long getId() { return id; } diff --git a/client/src/main/java/com/github/gotify/client/model/User.java b/client/src/main/java/com/github/gotify/client/model/User.java index 240db9e..b636127 100644 --- a/client/src/main/java/com/github/gotify/client/model/User.java +++ b/client/src/main/java/com/github/gotify/client/model/User.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -27,13 +27,13 @@ import java.io.IOException; * The User holds information about permission and other stuff. */ @ApiModel(description = "The User holds information about permission and other stuff.") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class User { @SerializedName("admin") private Boolean admin = null; @SerializedName("id") - private Integer id = null; + private Long id = null; @SerializedName("name") private String name = null; @@ -61,7 +61,7 @@ public class User { * @return id **/ @ApiModelProperty(example = "25", required = true, value = "The user id.") - public Integer getId() { + public Long getId() { return id; } diff --git a/client/src/main/java/com/github/gotify/client/model/UserPass.java b/client/src/main/java/com/github/gotify/client/model/UserPass.java index 1bfb387..fb5b020 100644 --- a/client/src/main/java/com/github/gotify/client/model/UserPass.java +++ b/client/src/main/java/com/github/gotify/client/model/UserPass.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -27,7 +27,7 @@ import java.io.IOException; * The Password for updating the user. */ @ApiModel(description = "The Password for updating the user.") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class UserPass { @SerializedName("pass") private String pass = null; diff --git a/client/src/main/java/com/github/gotify/client/model/UserWithPass.java b/client/src/main/java/com/github/gotify/client/model/UserWithPass.java index c6f97e5..25583a1 100644 --- a/client/src/main/java/com/github/gotify/client/model/UserWithPass.java +++ b/client/src/main/java/com/github/gotify/client/model/UserWithPass.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -27,13 +27,13 @@ import java.io.IOException; * The UserWithPass holds information about the credentials and other stuff. */ @ApiModel(description = "The UserWithPass holds information about the credentials and other stuff.") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class UserWithPass { @SerializedName("admin") private Boolean admin = null; @SerializedName("id") - private Integer id = null; + private Long id = null; @SerializedName("name") private String name = null; @@ -64,7 +64,7 @@ public class UserWithPass { * @return id **/ @ApiModelProperty(example = "25", required = true, value = "The user id.") - public Integer getId() { + public Long getId() { return id; } diff --git a/client/src/main/java/com/github/gotify/client/model/VersionInfo.java b/client/src/main/java/com/github/gotify/client/model/VersionInfo.java index 7d78707..58b36ff 100644 --- a/client/src/main/java/com/github/gotify/client/model/VersionInfo.java +++ b/client/src/main/java/com/github/gotify/client/model/VersionInfo.java @@ -2,7 +2,7 @@ * Gotify REST-API. * This is the documentation of the Gotify REST-API. # Authentication In Gotify there are two token types: __clientToken__: a client is something that receives message and manages stuff like creating new tokens or delete messages. (f.ex this token should be used for an android app) __appToken__: an application is something that sends messages (f.ex. this token should be used for a shell script) The token can be either transmitted through a header named `X-Gotify-Key` or a query parameter named `token`. There is also the possibility to authenticate through basic auth, this should only be used for creating a clientToken. \\--- Found a bug or have some questions? [Create an issue on GitHub](https://github.com/gotify/server/issues) * - * OpenAPI spec version: 1.0.6 + * OpenAPI spec version: 2.0.1 * * * NOTE: This class is auto generated by the swagger code generator program. @@ -27,7 +27,7 @@ import java.io.IOException; * VersionInfo Model */ @ApiModel(description = "VersionInfo Model") -@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2019-02-17T19:42:51.206+01:00") +@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2020-06-24T18:39:01.386+02:00") public class VersionInfo { @SerializedName("buildDate") private String buildDate = null; diff --git a/client/src/test/java/com/github/gotify/client/api/ApplicationApiTest.java b/client/src/test/java/com/github/gotify/client/api/ApplicationApiTest.java index 78659fd..9e494b9 100644 --- a/client/src/test/java/com/github/gotify/client/api/ApplicationApiTest.java +++ b/client/src/test/java/com/github/gotify/client/api/ApplicationApiTest.java @@ -43,7 +43,7 @@ public class ApplicationApiTest { */ @Test public void deleteAppTest() { - Integer id = null; + Long id = null; // Void response = api.deleteApp(id); // TODO: test validations @@ -67,7 +67,7 @@ public class ApplicationApiTest { @Test public void updateApplicationTest() { Application body = null; - Integer id = null; + Long id = null; // Application response = api.updateApplication(body, id); // TODO: test validations @@ -80,7 +80,7 @@ public class ApplicationApiTest { @Test public void uploadAppImageTest() { File file = null; - Integer id = null; + Long id = null; // Application response = api.uploadAppImage(file, id); // TODO: test validations diff --git a/client/src/test/java/com/github/gotify/client/api/ClientApiTest.java b/client/src/test/java/com/github/gotify/client/api/ClientApiTest.java index e4e0791..ed88083 100644 --- a/client/src/test/java/com/github/gotify/client/api/ClientApiTest.java +++ b/client/src/test/java/com/github/gotify/client/api/ClientApiTest.java @@ -42,7 +42,7 @@ public class ClientApiTest { */ @Test public void deleteClientTest() { - Integer id = null; + Long id = null; // Void response = api.deleteClient(id); // TODO: test validations @@ -56,6 +56,19 @@ public class ClientApiTest { public void getClientsTest() { // List response = api.getClients(); + // TODO: test validations + } + /** + * Update a client. + * + * + */ + @Test + public void updateClientTest() { + Client body = null; + Long id = null; + // Client response = api.updateClient(body, id); + // TODO: test validations } } diff --git a/client/src/test/java/com/github/gotify/client/api/HealthApiTest.java b/client/src/test/java/com/github/gotify/client/api/HealthApiTest.java new file mode 100644 index 0000000..83bea54 --- /dev/null +++ b/client/src/test/java/com/github/gotify/client/api/HealthApiTest.java @@ -0,0 +1,36 @@ +package com.github.gotify.client.api; + +import com.github.gotify.client.ApiClient; +import com.github.gotify.client.model.Health; +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * API tests for HealthApi + */ +public class HealthApiTest { + + private HealthApi api; + + @Before + public void setup() { + api = new ApiClient().createService(HealthApi.class); + } + + /** + * Get health information. + * + * + */ + @Test + public void getHealthTest() { + // Health response = api.getHealth(); + + // TODO: test validations + } +} diff --git a/client/src/test/java/com/github/gotify/client/api/MessageApiTest.java b/client/src/test/java/com/github/gotify/client/api/MessageApiTest.java index 3d05122..e80c1f4 100644 --- a/client/src/test/java/com/github/gotify/client/api/MessageApiTest.java +++ b/client/src/test/java/com/github/gotify/client/api/MessageApiTest.java @@ -43,7 +43,7 @@ public class MessageApiTest { */ @Test public void deleteAppMessagesTest() { - Integer id = null; + Long id = null; // Void response = api.deleteAppMessages(id); // TODO: test validations @@ -55,7 +55,7 @@ public class MessageApiTest { */ @Test public void deleteMessageTest() { - Integer id = null; + Long id = null; // Void response = api.deleteMessage(id); // TODO: test validations @@ -78,9 +78,9 @@ public class MessageApiTest { */ @Test public void getAppMessagesTest() { - Integer id = null; + Long id = null; Integer limit = null; - Integer since = null; + Long since = null; // PagedMessages response = api.getAppMessages(id, limit, since); // TODO: test validations @@ -93,7 +93,7 @@ public class MessageApiTest { @Test public void getMessagesTest() { Integer limit = null; - Integer since = null; + Long since = null; // PagedMessages response = api.getMessages(limit, since); // TODO: test validations diff --git a/client/src/test/java/com/github/gotify/client/api/PluginApiTest.java b/client/src/test/java/com/github/gotify/client/api/PluginApiTest.java index 24887c6..0e7a552 100644 --- a/client/src/test/java/com/github/gotify/client/api/PluginApiTest.java +++ b/client/src/test/java/com/github/gotify/client/api/PluginApiTest.java @@ -30,7 +30,7 @@ public class PluginApiTest { */ @Test public void disablePluginTest() { - Integer id = null; + Long id = null; // Void response = api.disablePlugin(id); // TODO: test validations @@ -42,7 +42,7 @@ public class PluginApiTest { */ @Test public void enablePluginTest() { - Integer id = null; + Long id = null; // Void response = api.enablePlugin(id); // TODO: test validations @@ -54,7 +54,7 @@ public class PluginApiTest { */ @Test public void getPluginConfigTest() { - Integer id = null; + Long id = null; // Object response = api.getPluginConfig(id); // TODO: test validations @@ -66,7 +66,7 @@ public class PluginApiTest { */ @Test public void getPluginDisplayTest() { - Integer id = null; + Long id = null; // String response = api.getPluginDisplay(id); // TODO: test validations @@ -89,7 +89,7 @@ public class PluginApiTest { */ @Test public void updatePluginConfigTest() { - Integer id = null; + Long id = null; // Void response = api.updatePluginConfig(id); // TODO: test validations diff --git a/client/src/test/java/com/github/gotify/client/api/UserApiTest.java b/client/src/test/java/com/github/gotify/client/api/UserApiTest.java index c507f96..94d0a12 100644 --- a/client/src/test/java/com/github/gotify/client/api/UserApiTest.java +++ b/client/src/test/java/com/github/gotify/client/api/UserApiTest.java @@ -55,7 +55,7 @@ public class UserApiTest { */ @Test public void deleteUserTest() { - Integer id = null; + Long id = null; // Void response = api.deleteUser(id); // TODO: test validations @@ -67,7 +67,7 @@ public class UserApiTest { */ @Test public void getUserTest() { - Integer id = null; + Long id = null; // User response = api.getUser(id); // TODO: test validations @@ -102,7 +102,7 @@ public class UserApiTest { */ @Test public void updateUserTest() { - Integer id = null; + Long id = null; UserWithPass body = null; // User response = api.updateUser(id, body);