Adjust UserList

docs/OrganizationApi.md

@@ -1383,7 +1383,7 @@ Name | Type | Description  | Notes
 
 <a name="orgListMembers"></a>
 # **orgListMembers**
-> UserList orgListMembers(org)
+> List&lt;User&gt; orgListMembers(org)
 
 List an organization&#39;s members
 
@@ -1424,7 +1424,7 @@ Token.setApiKey("YOUR API KEY");
 OrganizationApi apiInstance = new OrganizationApi();
 String org = "org_example"; // String | name of the organization
 try {
-    UserList result = apiInstance.orgListMembers(org);
+    List<User> result = apiInstance.orgListMembers(org);
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling OrganizationApi#orgListMembers");
@@ -1440,7 +1440,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**UserList**](UserList.md)
+[**List&lt;User&gt;**](User.md)
 
 ### Authorization
 
@@ -1453,7 +1453,7 @@ Name | Type | Description  | Notes
 
 <a name="orgListPublicMembers"></a>
 # **orgListPublicMembers**
-> UserList orgListPublicMembers(org)
+> List&lt;User&gt; orgListPublicMembers(org)
 
 List an organization&#39;s public members
 
@@ -1494,7 +1494,7 @@ Token.setApiKey("YOUR API KEY");
 OrganizationApi apiInstance = new OrganizationApi();
 String org = "org_example"; // String | name of the organization
 try {
-    UserList result = apiInstance.orgListPublicMembers(org);
+    List<User> result = apiInstance.orgListPublicMembers(org);
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling OrganizationApi#orgListPublicMembers");
@@ -1510,7 +1510,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**UserList**](UserList.md)
+[**List&lt;User&gt;**](User.md)
 
 ### Authorization
 
@@ -1593,7 +1593,7 @@ Name | Type | Description  | Notes
 
 <a name="orgListTeamMembers"></a>
 # **orgListTeamMembers**
-> UserList orgListTeamMembers(id)
+> List&lt;User&gt; orgListTeamMembers(id)
 
 List a team&#39;s members
 
@@ -1634,7 +1634,7 @@ Token.setApiKey("YOUR API KEY");
 OrganizationApi apiInstance = new OrganizationApi();
 Integer id = 56; // Integer | id of the team
 try {
-    UserList result = apiInstance.orgListTeamMembers(id);
+    List<User> result = apiInstance.orgListTeamMembers(id);
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling OrganizationApi#orgListTeamMembers");
@@ -1650,7 +1650,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**UserList**](UserList.md)
+[**List&lt;User&gt;**](User.md)
 
 ### Authorization
 

docs/RepositoryApi.md

@@ -2573,7 +2573,7 @@ Name | Type | Description  | Notes
 
 <a name="repoListCollaborators"></a>
 # **repoListCollaborators**
-> UserList repoListCollaborators(owner, repo)
+> List&lt;User&gt; repoListCollaborators(owner, repo)
 
 List a repository&#39;s collaborators
 
@@ -2615,7 +2615,7 @@ RepositoryApi apiInstance = new RepositoryApi();
 String owner = "owner_example"; // String | owner of the repo
 String repo = "repo_example"; // String | name of the repo
 try {
-    UserList result = apiInstance.repoListCollaborators(owner, repo);
+    List<User> result = apiInstance.repoListCollaborators(owner, repo);
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling RepositoryApi#repoListCollaborators");
@@ -2632,7 +2632,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**UserList**](UserList.md)
+[**List&lt;User&gt;**](User.md)
 
 ### Authorization
 
@@ -3007,7 +3007,7 @@ Name | Type | Description  | Notes
 
 <a name="repoListStargazers"></a>
 # **repoListStargazers**
-> UserList repoListStargazers(owner, repo)
+> List&lt;User&gt; repoListStargazers(owner, repo)
 
 List a repo&#39;s stargazers
 
@@ -3049,7 +3049,7 @@ RepositoryApi apiInstance = new RepositoryApi();
 String owner = "owner_example"; // String | owner of the repo
 String repo = "repo_example"; // String | name of the repo
 try {
-    UserList result = apiInstance.repoListStargazers(owner, repo);
+    List<User> result = apiInstance.repoListStargazers(owner, repo);
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling RepositoryApi#repoListStargazers");
@@ -3066,7 +3066,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**UserList**](UserList.md)
+[**List&lt;User&gt;**](User.md)
 
 ### Authorization
 
@@ -3153,7 +3153,7 @@ Name | Type | Description  | Notes
 
 <a name="repoListSubscribers"></a>
 # **repoListSubscribers**
-> UserList repoListSubscribers(owner, repo)
+> List&lt;User&gt; repoListSubscribers(owner, repo)
 
 List a repo&#39;s watchers
 
@@ -3195,7 +3195,7 @@ RepositoryApi apiInstance = new RepositoryApi();
 String owner = "owner_example"; // String | owner of the repo
 String repo = "repo_example"; // String | name of the repo
 try {
-    UserList result = apiInstance.repoListSubscribers(owner, repo);
+    List<User> result = apiInstance.repoListSubscribers(owner, repo);
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling RepositoryApi#repoListSubscribers");
@@ -3212,7 +3212,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**UserList**](UserList.md)
+[**List&lt;User&gt;**](User.md)
 
 ### Authorization
 

docs/UserApi.md

@@ -885,7 +885,7 @@ Name | Type | Description  | Notes
 
 <a name="userCurrentListFollowers"></a>
 # **userCurrentListFollowers**
-> UserList userCurrentListFollowers()
+> List&lt;User&gt; userCurrentListFollowers()
 
 List the authenticated user&#39;s followers
 
@@ -925,7 +925,7 @@ Token.setApiKey("YOUR API KEY");
 
 UserApi apiInstance = new UserApi();
 try {
-    UserList result = apiInstance.userCurrentListFollowers();
+    List<User> result = apiInstance.userCurrentListFollowers();
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling UserApi#userCurrentListFollowers");
@@ -938,7 +938,7 @@ This endpoint does not need any parameter.
 
 ### Return type
 
-[**UserList**](UserList.md)
+[**List&lt;User&gt;**](User.md)
 
 ### Authorization
 
@@ -951,7 +951,7 @@ This endpoint does not need any parameter.
 
 <a name="userCurrentListFollowing"></a>
 # **userCurrentListFollowing**
-> UserList userCurrentListFollowing()
+> List&lt;User&gt; userCurrentListFollowing()
 
 List the users that the authenticated user is following
 
@@ -991,7 +991,7 @@ Token.setApiKey("YOUR API KEY");
 
 UserApi apiInstance = new UserApi();
 try {
-    UserList result = apiInstance.userCurrentListFollowing();
+    List<User> result = apiInstance.userCurrentListFollowing();
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling UserApi#userCurrentListFollowing");
@@ -1004,7 +1004,7 @@ This endpoint does not need any parameter.
 
 ### Return type
 
-[**UserList**](UserList.md)
+[**List&lt;User&gt;**](User.md)
 
 ### Authorization
 
@@ -2104,7 +2104,7 @@ This endpoint does not need any parameter.
 
 <a name="userListFollowers"></a>
 # **userListFollowers**
-> UserList userListFollowers(username)
+> List&lt;User&gt; userListFollowers(username)
 
 List the given user&#39;s followers
 
@@ -2145,7 +2145,7 @@ Token.setApiKey("YOUR API KEY");
 UserApi apiInstance = new UserApi();
 String username = "username_example"; // String | username of user
 try {
-    UserList result = apiInstance.userListFollowers(username);
+    List<User> result = apiInstance.userListFollowers(username);
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling UserApi#userListFollowers");
@@ -2161,7 +2161,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**UserList**](UserList.md)
+[**List&lt;User&gt;**](User.md)
 
 ### Authorization
 
@@ -2174,7 +2174,7 @@ Name | Type | Description  | Notes
 
 <a name="userListFollowing"></a>
 # **userListFollowing**
-> UserList userListFollowing(username)
+> List&lt;User&gt; userListFollowing(username)
 
 List the users that the given user is following
 
@@ -2215,7 +2215,7 @@ Token.setApiKey("YOUR API KEY");
 UserApi apiInstance = new UserApi();
 String username = "username_example"; // String | username of user
 try {
-    UserList result = apiInstance.userListFollowing(username);
+    List<User> result = apiInstance.userListFollowing(username);
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling UserApi#userListFollowing");
@@ -2231,7 +2231,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**UserList**](UserList.md)
+[**List&lt;User&gt;**](User.md)
 
 ### Authorization
 
@@ -2594,7 +2594,7 @@ Name | Type | Description  | Notes
 
 <a name="userSearch"></a>
 # **userSearch**
-> UserList userSearch(q, limit)
+> UserSearchList userSearch(q, limit)
 
 Search for users
 
@@ -2636,7 +2636,7 @@ UserApi apiInstance = new UserApi();
 String q = "q_example"; // String | keyword
 Integer limit = 56; // Integer | maximum number of users to return
 try {
-    UserList result = apiInstance.userSearch(q, limit);
+    UserSearchList result = apiInstance.userSearch(q, limit);
     System.out.println(result);
 } catch (ApiException e) {
     System.err.println("Exception when calling UserApi#userSearch");
@@ -2653,7 +2653,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**UserList**](UserList.md)
+[**UserSearchList**](UserSearchList.md)
 
 ### Authorization
 

docs/UserSearchList.md

@@ -1,5 +1,5 @@
 
-# UserList
+# UserSearchList
 
 ## Properties
 Name | Type | Description | Notes

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 ##############################################################################
 ##
@@ -6,30 +6,12 @@
 ##
 ##############################################################################
 
-# Attempt to set APP_HOME
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-# Resolve links: $0 may be a link
+DEFAULT_JVM_OPTS=""
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -48,7 +30,6 @@ die () {
 cygwin=false
 msys=false
 darwin=false
-nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -59,11 +40,26 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -89,7 +85,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -154,19 +150,11 @@ if $cygwin ; then
     esac
 fi
 
-# Escape application args
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-save () {
+function splitJvmOpts() {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    JVM_OPTS=("$@")
-    echo " "
 }
-APP_ARGS=$(save "$@")
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -49,6 +49,7 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -59,6 +60,11 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

src/main/java/io/gitea/ApiException.java

@@ -16,7 +16,7 @@ package io.gitea;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class ApiException extends Exception {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;

src/main/java/io/gitea/Configuration.java

@@ -13,7 +13,7 @@
 
 package io.gitea;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Configuration {
     private static ApiClient defaultApiClient = new ApiClient();
 

src/main/java/io/gitea/Pair.java

@@ -13,7 +13,7 @@
 
 package io.gitea;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Pair {
     private String name = "";
     private String value = "";

src/main/java/io/gitea/StringUtil.java

@@ -13,7 +13,7 @@
 
 package io.gitea;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).

src/main/java/io/gitea/api/OrganizationApi.java

@@ -35,7 +35,7 @@ import io.gitea.model.EditTeamOption;
 import io.gitea.model.Organization;
 import io.gitea.model.Repository;
 import io.gitea.model.Team;
-import io.gitea.model.UserList;
+import io.gitea.model.User;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -2541,11 +2541,11 @@ public class OrganizationApi {
      * List an organization's members
      * 
      * @param org name of the organization (required)
-     * @return UserList
+     * @return List<User>
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public UserList orgListMembers(String org) throws ApiException {
+    public List<User> orgListMembers(String org) throws ApiException {
-        ApiResponse<UserList> resp = orgListMembersWithHttpInfo(org);
+        ApiResponse<List<User>> resp = orgListMembersWithHttpInfo(org);
         return resp.getData();
     }
 
@@ -2553,12 +2553,12 @@ public class OrganizationApi {
      * List an organization&#39;s members
      * 
      * @param org name of the organization (required)
-     * @return ApiResponse&lt;UserList&gt;
+     * @return ApiResponse&lt;List&lt;User&gt;&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<UserList> orgListMembersWithHttpInfo(String org) throws ApiException {
+    public ApiResponse<List<User>> orgListMembersWithHttpInfo(String org) throws ApiException {
         com.squareup.okhttp.Call call = orgListMembersValidateBeforeCall(org, null, null);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -2570,7 +2570,7 @@ public class OrganizationApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call orgListMembersAsync(String org, final ApiCallback<UserList> callback) throws ApiException {
+    public com.squareup.okhttp.Call orgListMembersAsync(String org, final ApiCallback<List<User>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -2592,7 +2592,7 @@ public class OrganizationApi {
         }
 
         com.squareup.okhttp.Call call = orgListMembersValidateBeforeCall(org, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
@@ -2664,11 +2664,11 @@ public class OrganizationApi {
      * List an organization&#39;s public members
      * 
      * @param org name of the organization (required)
-     * @return UserList
+     * @return List&lt;User&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public UserList orgListPublicMembers(String org) throws ApiException {
+    public List<User> orgListPublicMembers(String org) throws ApiException {
-        ApiResponse<UserList> resp = orgListPublicMembersWithHttpInfo(org);
+        ApiResponse<List<User>> resp = orgListPublicMembersWithHttpInfo(org);
         return resp.getData();
     }
 
@@ -2676,12 +2676,12 @@ public class OrganizationApi {
      * List an organization&#39;s public members
      * 
      * @param org name of the organization (required)
-     * @return ApiResponse&lt;UserList&gt;
+     * @return ApiResponse&lt;List&lt;User&gt;&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<UserList> orgListPublicMembersWithHttpInfo(String org) throws ApiException {
+    public ApiResponse<List<User>> orgListPublicMembersWithHttpInfo(String org) throws ApiException {
         com.squareup.okhttp.Call call = orgListPublicMembersValidateBeforeCall(org, null, null);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -2693,7 +2693,7 @@ public class OrganizationApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call orgListPublicMembersAsync(String org, final ApiCallback<UserList> callback) throws ApiException {
+    public com.squareup.okhttp.Call orgListPublicMembersAsync(String org, final ApiCallback<List<User>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -2715,7 +2715,7 @@ public class OrganizationApi {
         }
 
         com.squareup.okhttp.Call call = orgListPublicMembersValidateBeforeCall(org, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
@@ -2910,11 +2910,11 @@ public class OrganizationApi {
      * List a team&#39;s members
      * 
      * @param id id of the team (required)
-     * @return UserList
+     * @return List&lt;User&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public UserList orgListTeamMembers(Integer id) throws ApiException {
+    public List<User> orgListTeamMembers(Integer id) throws ApiException {
-        ApiResponse<UserList> resp = orgListTeamMembersWithHttpInfo(id);
+        ApiResponse<List<User>> resp = orgListTeamMembersWithHttpInfo(id);
         return resp.getData();
     }
 
@@ -2922,12 +2922,12 @@ public class OrganizationApi {
      * List a team&#39;s members
      * 
      * @param id id of the team (required)
-     * @return ApiResponse&lt;UserList&gt;
+     * @return ApiResponse&lt;List&lt;User&gt;&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<UserList> orgListTeamMembersWithHttpInfo(Integer id) throws ApiException {
+    public ApiResponse<List<User>> orgListTeamMembersWithHttpInfo(Integer id) throws ApiException {
         com.squareup.okhttp.Call call = orgListTeamMembersValidateBeforeCall(id, null, null);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -2939,7 +2939,7 @@ public class OrganizationApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call orgListTeamMembersAsync(Integer id, final ApiCallback<UserList> callback) throws ApiException {
+    public com.squareup.okhttp.Call orgListTeamMembersAsync(Integer id, final ApiCallback<List<User>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -2961,7 +2961,7 @@ public class OrganizationApi {
         }
 
         com.squareup.okhttp.Call call = orgListTeamMembersValidateBeforeCall(id, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }

src/main/java/io/gitea/api/RepositoryApi.java

@@ -50,7 +50,7 @@ import io.gitea.model.Repository;
 import io.gitea.model.SearchResults;
 import io.gitea.model.Status;
 import io.gitea.model.TrackedTime;
-import io.gitea.model.UserList;
+import io.gitea.model.User;
 import io.gitea.model.WatchInfo;
 
 import java.lang.reflect.Type;
@@ -4927,11 +4927,11 @@ public class RepositoryApi {
      * 
      * @param owner owner of the repo (required)
      * @param repo name of the repo (required)
-     * @return UserList
+     * @return List<User>
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public UserList repoListCollaborators(String owner, String repo) throws ApiException {
+    public List<User> repoListCollaborators(String owner, String repo) throws ApiException {
-        ApiResponse<UserList> resp = repoListCollaboratorsWithHttpInfo(owner, repo);
+        ApiResponse<List<User>> resp = repoListCollaboratorsWithHttpInfo(owner, repo);
         return resp.getData();
     }
 
@@ -4940,12 +4940,12 @@ public class RepositoryApi {
      * 
      * @param owner owner of the repo (required)
      * @param repo name of the repo (required)
-     * @return ApiResponse&lt;UserList&gt;
+     * @return ApiResponse&lt;List&lt;User&gt;&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<UserList> repoListCollaboratorsWithHttpInfo(String owner, String repo) throws ApiException {
+    public ApiResponse<List<User>> repoListCollaboratorsWithHttpInfo(String owner, String repo) throws ApiException {
         com.squareup.okhttp.Call call = repoListCollaboratorsValidateBeforeCall(owner, repo, null, null);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -4958,7 +4958,7 @@ public class RepositoryApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call repoListCollaboratorsAsync(String owner, String repo, final ApiCallback<UserList> callback) throws ApiException {
+    public com.squareup.okhttp.Call repoListCollaboratorsAsync(String owner, String repo, final ApiCallback<List<User>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -4980,7 +4980,7 @@ public class RepositoryApi {
         }
 
         com.squareup.okhttp.Call call = repoListCollaboratorsValidateBeforeCall(owner, repo, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
@@ -5735,11 +5735,11 @@ public class RepositoryApi {
      * 
      * @param owner owner of the repo (required)
      * @param repo name of the repo (required)
-     * @return UserList
+     * @return List&lt;User&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public UserList repoListStargazers(String owner, String repo) throws ApiException {
+    public List<User> repoListStargazers(String owner, String repo) throws ApiException {
-        ApiResponse<UserList> resp = repoListStargazersWithHttpInfo(owner, repo);
+        ApiResponse<List<User>> resp = repoListStargazersWithHttpInfo(owner, repo);
         return resp.getData();
     }
 
@@ -5748,12 +5748,12 @@ public class RepositoryApi {
      * 
      * @param owner owner of the repo (required)
      * @param repo name of the repo (required)
-     * @return ApiResponse&lt;UserList&gt;
+     * @return ApiResponse&lt;List&lt;User&gt;&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<UserList> repoListStargazersWithHttpInfo(String owner, String repo) throws ApiException {
+    public ApiResponse<List<User>> repoListStargazersWithHttpInfo(String owner, String repo) throws ApiException {
         com.squareup.okhttp.Call call = repoListStargazersValidateBeforeCall(owner, repo, null, null);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -5766,7 +5766,7 @@ public class RepositoryApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call repoListStargazersAsync(String owner, String repo, final ApiCallback<UserList> callback) throws ApiException {
+    public com.squareup.okhttp.Call repoListStargazersAsync(String owner, String repo, final ApiCallback<List<User>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -5788,7 +5788,7 @@ public class RepositoryApi {
         }
 
         com.squareup.okhttp.Call call = repoListStargazersValidateBeforeCall(owner, repo, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
@@ -6011,11 +6011,11 @@ public class RepositoryApi {
      * 
      * @param owner owner of the repo (required)
      * @param repo name of the repo (required)
-     * @return UserList
+     * @return List&lt;User&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public UserList repoListSubscribers(String owner, String repo) throws ApiException {
+    public List<User> repoListSubscribers(String owner, String repo) throws ApiException {
-        ApiResponse<UserList> resp = repoListSubscribersWithHttpInfo(owner, repo);
+        ApiResponse<List<User>> resp = repoListSubscribersWithHttpInfo(owner, repo);
         return resp.getData();
     }
 
@@ -6024,12 +6024,12 @@ public class RepositoryApi {
      * 
      * @param owner owner of the repo (required)
      * @param repo name of the repo (required)
-     * @return ApiResponse&lt;UserList&gt;
+     * @return ApiResponse&lt;List&lt;User&gt;&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<UserList> repoListSubscribersWithHttpInfo(String owner, String repo) throws ApiException {
+    public ApiResponse<List<User>> repoListSubscribersWithHttpInfo(String owner, String repo) throws ApiException {
         com.squareup.okhttp.Call call = repoListSubscribersValidateBeforeCall(owner, repo, null, null);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -6042,7 +6042,7 @@ public class RepositoryApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call repoListSubscribersAsync(String owner, String repo, final ApiCallback<UserList> callback) throws ApiException {
+    public com.squareup.okhttp.Call repoListSubscribersAsync(String owner, String repo, final ApiCallback<List<User>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -6064,7 +6064,7 @@ public class RepositoryApi {
         }
 
         com.squareup.okhttp.Call call = repoListSubscribersValidateBeforeCall(owner, repo, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }

src/main/java/io/gitea/api/UserApi.java

@@ -38,7 +38,7 @@ import io.gitea.model.PublicKey;
 import io.gitea.model.Repository;
 import io.gitea.model.TrackedTime;
 import io.gitea.model.User;
-import io.gitea.model.UserList;
+import io.gitea.model.UserSearchList;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -1587,23 +1587,23 @@ public class UserApi {
     /**
      * List the authenticated user's followers
      * 
-     * @return UserList
+     * @return List<User>
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public UserList userCurrentListFollowers() throws ApiException {
+    public List<User> userCurrentListFollowers() throws ApiException {
-        ApiResponse<UserList> resp = userCurrentListFollowersWithHttpInfo();
+        ApiResponse<List<User>> resp = userCurrentListFollowersWithHttpInfo();
         return resp.getData();
     }
 
     /**
      * List the authenticated user&#39;s followers
      * 
-     * @return ApiResponse&lt;UserList&gt;
+     * @return ApiResponse&lt;List&lt;User&gt;&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<UserList> userCurrentListFollowersWithHttpInfo() throws ApiException {
+    public ApiResponse<List<User>> userCurrentListFollowersWithHttpInfo() throws ApiException {
         com.squareup.okhttp.Call call = userCurrentListFollowersValidateBeforeCall(null, null);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -1614,7 +1614,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call userCurrentListFollowersAsync(final ApiCallback<UserList> callback) throws ApiException {
+    public com.squareup.okhttp.Call userCurrentListFollowersAsync(final ApiCallback<List<User>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -1636,7 +1636,7 @@ public class UserApi {
         }
 
         com.squareup.okhttp.Call call = userCurrentListFollowersValidateBeforeCall(progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
@@ -1700,23 +1700,23 @@ public class UserApi {
     /**
      * List the users that the authenticated user is following
      * 
-     * @return UserList
+     * @return List&lt;User&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public UserList userCurrentListFollowing() throws ApiException {
+    public List<User> userCurrentListFollowing() throws ApiException {
-        ApiResponse<UserList> resp = userCurrentListFollowingWithHttpInfo();
+        ApiResponse<List<User>> resp = userCurrentListFollowingWithHttpInfo();
         return resp.getData();
     }
 
     /**
      * List the users that the authenticated user is following
      * 
-     * @return ApiResponse&lt;UserList&gt;
+     * @return ApiResponse&lt;List&lt;User&gt;&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<UserList> userCurrentListFollowingWithHttpInfo() throws ApiException {
+    public ApiResponse<List<User>> userCurrentListFollowingWithHttpInfo() throws ApiException {
         com.squareup.okhttp.Call call = userCurrentListFollowingValidateBeforeCall(null, null);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -1727,7 +1727,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call userCurrentListFollowingAsync(final ApiCallback<UserList> callback) throws ApiException {
+    public com.squareup.okhttp.Call userCurrentListFollowingAsync(final ApiCallback<List<User>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -1749,7 +1749,7 @@ public class UserApi {
         }
 
         com.squareup.okhttp.Call call = userCurrentListFollowingValidateBeforeCall(progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
@@ -3691,11 +3691,11 @@ public class UserApi {
      * List the given user&#39;s followers
      * 
      * @param username username of user (required)
-     * @return UserList
+     * @return List&lt;User&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public UserList userListFollowers(String username) throws ApiException {
+    public List<User> userListFollowers(String username) throws ApiException {
-        ApiResponse<UserList> resp = userListFollowersWithHttpInfo(username);
+        ApiResponse<List<User>> resp = userListFollowersWithHttpInfo(username);
         return resp.getData();
     }
 
@@ -3703,12 +3703,12 @@ public class UserApi {
      * List the given user&#39;s followers
      * 
      * @param username username of user (required)
-     * @return ApiResponse&lt;UserList&gt;
+     * @return ApiResponse&lt;List&lt;User&gt;&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<UserList> userListFollowersWithHttpInfo(String username) throws ApiException {
+    public ApiResponse<List<User>> userListFollowersWithHttpInfo(String username) throws ApiException {
         com.squareup.okhttp.Call call = userListFollowersValidateBeforeCall(username, null, null);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -3720,7 +3720,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call userListFollowersAsync(String username, final ApiCallback<UserList> callback) throws ApiException {
+    public com.squareup.okhttp.Call userListFollowersAsync(String username, final ApiCallback<List<User>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -3742,7 +3742,7 @@ public class UserApi {
         }
 
         com.squareup.okhttp.Call call = userListFollowersValidateBeforeCall(username, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
@@ -3814,11 +3814,11 @@ public class UserApi {
      * List the users that the given user is following
      * 
      * @param username username of user (required)
-     * @return UserList
+     * @return List&lt;User&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public UserList userListFollowing(String username) throws ApiException {
+    public List<User> userListFollowing(String username) throws ApiException {
-        ApiResponse<UserList> resp = userListFollowingWithHttpInfo(username);
+        ApiResponse<List<User>> resp = userListFollowingWithHttpInfo(username);
         return resp.getData();
     }
 
@@ -3826,12 +3826,12 @@ public class UserApi {
      * List the users that the given user is following
      * 
      * @param username username of user (required)
-     * @return ApiResponse&lt;UserList&gt;
+     * @return ApiResponse&lt;List&lt;User&gt;&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<UserList> userListFollowingWithHttpInfo(String username) throws ApiException {
+    public ApiResponse<List<User>> userListFollowingWithHttpInfo(String username) throws ApiException {
         com.squareup.okhttp.Call call = userListFollowingValidateBeforeCall(username, null, null);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -3843,7 +3843,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call userListFollowingAsync(String username, final ApiCallback<UserList> callback) throws ApiException {
+    public com.squareup.okhttp.Call userListFollowingAsync(String username, final ApiCallback<List<User>> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -3865,7 +3865,7 @@ public class UserApi {
         }
 
         com.squareup.okhttp.Call call = userListFollowingValidateBeforeCall(username, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<List<User>>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
@@ -4552,11 +4552,11 @@ public class UserApi {
      * 
      * @param q keyword (optional)
      * @param limit maximum number of users to return (optional)
-     * @return UserList
+     * @return UserSearchList
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public UserList userSearch(String q, Integer limit) throws ApiException {
+    public UserSearchList userSearch(String q, Integer limit) throws ApiException {
-        ApiResponse<UserList> resp = userSearchWithHttpInfo(q, limit);
+        ApiResponse<UserSearchList> resp = userSearchWithHttpInfo(q, limit);
         return resp.getData();
     }
 
@@ -4565,12 +4565,12 @@ public class UserApi {
      * 
      * @param q keyword (optional)
      * @param limit maximum number of users to return (optional)
-     * @return ApiResponse&lt;UserList&gt;
+     * @return ApiResponse&lt;UserSearchList&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<UserList> userSearchWithHttpInfo(String q, Integer limit) throws ApiException {
+    public ApiResponse<UserSearchList> userSearchWithHttpInfo(String q, Integer limit) throws ApiException {
         com.squareup.okhttp.Call call = userSearchValidateBeforeCall(q, limit, null, null);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<UserSearchList>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -4583,7 +4583,7 @@ public class UserApi {
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call userSearchAsync(String q, Integer limit, final ApiCallback<UserList> callback) throws ApiException {
+    public com.squareup.okhttp.Call userSearchAsync(String q, Integer limit, final ApiCallback<UserSearchList> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -4605,7 +4605,7 @@ public class UserApi {
         }
 
         com.squareup.okhttp.Call call = userSearchValidateBeforeCall(q, limit, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<UserList>(){}.getType();
+        Type localVarReturnType = new TypeToken<UserSearchList>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }

src/main/java/io/gitea/auth/ApiKeyAuth.java

@@ -18,7 +18,7 @@ import io.gitea.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;

src/main/java/io/gitea/auth/OAuth.java

@@ -18,7 +18,7 @@ import io.gitea.Pair;
 import java.util.Map;
 import java.util.List;
 
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class OAuth implements Authentication {
   private String accessToken;
 

src/main/java/io/gitea/model/AddCollaboratorOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * AddCollaboratorOption options when adding a user as a collaborator of a repository
  */
 @ApiModel(description = "AddCollaboratorOption options when adding a user as a collaborator of a repository")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class AddCollaboratorOption {
   @SerializedName("permission")
   private String permission = null;

src/main/java/io/gitea/model/AddTimeOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * AddTimeOption options for adding time to an issue
  */
 @ApiModel(description = "AddTimeOption options for adding time to an issue")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class AddTimeOption {
   @SerializedName("time")
   private Long time = null;

src/main/java/io/gitea/model/Attachment.java

@@ -28,7 +28,7 @@ import org.threeten.bp.OffsetDateTime;
  * Attachment a generic attachment
  */
 @ApiModel(description = "Attachment a generic attachment")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Attachment {
   @SerializedName("browser_download_url")
   private String browserDownloadUrl = null;

src/main/java/io/gitea/model/Branch.java

@@ -28,7 +28,7 @@ import java.io.IOException;
  * Branch represents a repository branch
  */
 @ApiModel(description = "Branch represents a repository branch")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Branch {
   @SerializedName("commit")
   private PayloadCommit commit = null;

src/main/java/io/gitea/model/Comment.java

@@ -29,7 +29,7 @@ import org.threeten.bp.OffsetDateTime;
  * Comment represents a comment on a commit or issue
  */
 @ApiModel(description = "Comment represents a comment on a commit or issue")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Comment {
   @SerializedName("body")
   private String body = null;

src/main/java/io/gitea/model/CreateEmailOption.java

@@ -29,7 +29,7 @@ import java.util.List;
  * CreateEmailOption options when creating email addresses
  */
 @ApiModel(description = "CreateEmailOption options when creating email addresses")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateEmailOption {
   @SerializedName("emails")
   private List<String> emails = null;

src/main/java/io/gitea/model/CreateForkOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * CreateForkOption options for creating a fork
  */
 @ApiModel(description = "CreateForkOption options for creating a fork")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateForkOption {
   @SerializedName("organization")
   private String organization = null;

src/main/java/io/gitea/model/CreateGPGKeyOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * CreateGPGKeyOption options create user GPG key
  */
 @ApiModel(description = "CreateGPGKeyOption options create user GPG key")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateGPGKeyOption {
   @SerializedName("armored_public_key")
   private String armoredPublicKey = null;

src/main/java/io/gitea/model/CreateHookOption.java

@@ -31,7 +31,7 @@ import java.util.Map;
  * CreateHookOption options when create a hook
  */
 @ApiModel(description = "CreateHookOption options when create a hook")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateHookOption {
   @SerializedName("active")
   private Boolean active = false;

src/main/java/io/gitea/model/CreateIssueCommentOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * CreateIssueCommentOption options for creating a comment on an issue
  */
 @ApiModel(description = "CreateIssueCommentOption options for creating a comment on an issue")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateIssueCommentOption {
   @SerializedName("body")
   private String body = null;

src/main/java/io/gitea/model/CreateIssueOption.java

@@ -30,7 +30,7 @@ import org.threeten.bp.OffsetDateTime;
  * CreateIssueOption options to create one issue
  */
 @ApiModel(description = "CreateIssueOption options to create one issue")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateIssueOption {
   @SerializedName("assignee")
   private String assignee = null;

src/main/java/io/gitea/model/CreateKeyOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * CreateKeyOption options when creating a key
  */
 @ApiModel(description = "CreateKeyOption options when creating a key")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateKeyOption {
   @SerializedName("key")
   private String key = null;

src/main/java/io/gitea/model/CreateLabelOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * CreateLabelOption options for creating a label
  */
 @ApiModel(description = "CreateLabelOption options for creating a label")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateLabelOption {
   @SerializedName("color")
   private String color = null;

src/main/java/io/gitea/model/CreateMilestoneOption.java

@@ -28,7 +28,7 @@ import org.threeten.bp.OffsetDateTime;
  * CreateMilestoneOption options for creating a milestone
  */
 @ApiModel(description = "CreateMilestoneOption options for creating a milestone")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateMilestoneOption {
   @SerializedName("description")
   private String description = null;

src/main/java/io/gitea/model/CreateOrgOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * CreateOrgOption options for creating an organization
  */
 @ApiModel(description = "CreateOrgOption options for creating an organization")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateOrgOption {
   @SerializedName("description")
   private String description = null;

src/main/java/io/gitea/model/CreatePullRequestOption.java

@@ -30,7 +30,7 @@ import org.threeten.bp.OffsetDateTime;
  * CreatePullRequestOption options when creating a pull request
  */
 @ApiModel(description = "CreatePullRequestOption options when creating a pull request")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreatePullRequestOption {
   @SerializedName("assignee")
   private String assignee = null;

src/main/java/io/gitea/model/CreateReleaseOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * CreateReleaseOption options when creating a release
  */
 @ApiModel(description = "CreateReleaseOption options when creating a release")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateReleaseOption {
   @SerializedName("body")
   private String body = null;

src/main/java/io/gitea/model/CreateRepoOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * CreateRepoOption options when creating repository
  */
 @ApiModel(description = "CreateRepoOption options when creating repository")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateRepoOption {
   @SerializedName("auto_init")
   private Boolean autoInit = null;

src/main/java/io/gitea/model/CreateStatusOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * CreateStatusOption holds the information needed to create a new Status for a Commit
  */
 @ApiModel(description = "CreateStatusOption holds the information needed to create a new Status for a Commit")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateStatusOption {
   @SerializedName("context")
   private String context = null;

src/main/java/io/gitea/model/CreateTeamOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * CreateTeamOption options for creating a team
  */
 @ApiModel(description = "CreateTeamOption options for creating a team")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateTeamOption {
   @SerializedName("description")
   private String description = null;

src/main/java/io/gitea/model/CreateUserOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * CreateUserOption create user options
  */
 @ApiModel(description = "CreateUserOption create user options")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class CreateUserOption {
   @SerializedName("email")
   private String email = null;

src/main/java/io/gitea/model/DeleteEmailOption.java

@@ -29,7 +29,7 @@ import java.util.List;
  * DeleteEmailOption options when deleting email addresses
  */
 @ApiModel(description = "DeleteEmailOption options when deleting email addresses")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class DeleteEmailOption {
   @SerializedName("emails")
   private List<String> emails = null;

src/main/java/io/gitea/model/DeployKey.java

@@ -28,7 +28,7 @@ import org.threeten.bp.OffsetDateTime;
  * DeployKey a deploy key
  */
 @ApiModel(description = "DeployKey a deploy key")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class DeployKey {
   @SerializedName("created_at")
   private OffsetDateTime createdAt = null;

src/main/java/io/gitea/model/EditAttachmentOptions.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * EditAttachmentOptions options for editing attachments
  */
 @ApiModel(description = "EditAttachmentOptions options for editing attachments")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditAttachmentOptions {
   @SerializedName("name")
   private String name = null;

src/main/java/io/gitea/model/EditDeadlineOption.java

@@ -28,7 +28,7 @@ import org.threeten.bp.OffsetDateTime;
  * EditDeadlineOption options for creating a deadline
  */
 @ApiModel(description = "EditDeadlineOption options for creating a deadline")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditDeadlineOption {
   @SerializedName("due_date")
   private OffsetDateTime dueDate = null;

src/main/java/io/gitea/model/EditHookOption.java

@@ -31,7 +31,7 @@ import java.util.Map;
  * EditHookOption options when modify one hook
  */
 @ApiModel(description = "EditHookOption options when modify one hook")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditHookOption {
   @SerializedName("active")
   private Boolean active = null;

src/main/java/io/gitea/model/EditIssueCommentOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * EditIssueCommentOption options for editing a comment
  */
 @ApiModel(description = "EditIssueCommentOption options for editing a comment")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditIssueCommentOption {
   @SerializedName("body")
   private String body = null;

src/main/java/io/gitea/model/EditIssueOption.java

@@ -30,7 +30,7 @@ import org.threeten.bp.OffsetDateTime;
  * EditIssueOption options for editing an issue
  */
 @ApiModel(description = "EditIssueOption options for editing an issue")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditIssueOption {
   @SerializedName("assignee")
   private String assignee = null;

src/main/java/io/gitea/model/EditLabelOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * EditLabelOption options for editing a label
  */
 @ApiModel(description = "EditLabelOption options for editing a label")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditLabelOption {
   @SerializedName("color")
   private String color = null;

src/main/java/io/gitea/model/EditMilestoneOption.java

@@ -28,7 +28,7 @@ import org.threeten.bp.OffsetDateTime;
  * EditMilestoneOption options for editing a milestone
  */
 @ApiModel(description = "EditMilestoneOption options for editing a milestone")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditMilestoneOption {
   @SerializedName("description")
   private String description = null;

src/main/java/io/gitea/model/EditOrgOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * EditOrgOption options for editing an organization
  */
 @ApiModel(description = "EditOrgOption options for editing an organization")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditOrgOption {
   @SerializedName("description")
   private String description = null;

src/main/java/io/gitea/model/EditPullRequestOption.java

@@ -30,7 +30,7 @@ import org.threeten.bp.OffsetDateTime;
  * EditPullRequestOption options when modify pull request
  */
 @ApiModel(description = "EditPullRequestOption options when modify pull request")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditPullRequestOption {
   @SerializedName("assignee")
   private String assignee = null;

src/main/java/io/gitea/model/EditReleaseOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * EditReleaseOption options when editing a release
  */
 @ApiModel(description = "EditReleaseOption options when editing a release")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditReleaseOption {
   @SerializedName("body")
   private String body = null;

src/main/java/io/gitea/model/EditTeamOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * EditTeamOption options for editing a team
  */
 @ApiModel(description = "EditTeamOption options for editing a team")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditTeamOption {
   @SerializedName("description")
   private String description = null;

src/main/java/io/gitea/model/EditUserOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * EditUserOption edit user options
  */
 @ApiModel(description = "EditUserOption edit user options")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class EditUserOption {
   @SerializedName("active")
   private Boolean active = null;

src/main/java/io/gitea/model/Email.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * Email an email address belonging to a user
  */
 @ApiModel(description = "Email an email address belonging to a user")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Email {
   @SerializedName("email")
   private String email = null;

src/main/java/io/gitea/model/GPGKey.java

@@ -32,7 +32,7 @@ import org.threeten.bp.OffsetDateTime;
  * GPGKey a user GPG key to sign commit and tag in repository
  */
 @ApiModel(description = "GPGKey a user GPG key to sign commit and tag in repository")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class GPGKey {
   @SerializedName("can_certify")
   private Boolean canCertify = null;

src/main/java/io/gitea/model/GPGKeyEmail.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * GPGKeyEmail an email attached to a GPGKey
  */
 @ApiModel(description = "GPGKeyEmail an email attached to a GPGKey")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class GPGKeyEmail {
   @SerializedName("email")
   private String email = null;

src/main/java/io/gitea/model/Issue.java

@@ -34,7 +34,7 @@ import org.threeten.bp.OffsetDateTime;
  * Issue represents an issue in a repository
  */
 @ApiModel(description = "Issue represents an issue in a repository")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Issue {
   @SerializedName("assignee")
   private User assignee = null;

src/main/java/io/gitea/model/IssueDeadline.java

@@ -28,7 +28,7 @@ import org.threeten.bp.OffsetDateTime;
  * IssueDeadline represents an issue deadline
  */
 @ApiModel(description = "IssueDeadline represents an issue deadline")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class IssueDeadline {
   @SerializedName("due_date")
   private OffsetDateTime dueDate = null;

src/main/java/io/gitea/model/IssueLabelsOption.java

@@ -29,7 +29,7 @@ import java.util.List;
  * IssueLabelsOption a collection of labels
  */
 @ApiModel(description = "IssueLabelsOption a collection of labels")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class IssueLabelsOption {
   @SerializedName("labels")
   private List<Long> labels = null;

src/main/java/io/gitea/model/Label.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * Label a label to an issue or a pr
  */
 @ApiModel(description = "Label a label to an issue or a pr")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Label {
   @SerializedName("color")
   private String color = null;

src/main/java/io/gitea/model/MarkdownOption.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * MarkdownOption markdown options
  */
 @ApiModel(description = "MarkdownOption markdown options")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class MarkdownOption {
   @SerializedName("Context")
   private String context = null;

src/main/java/io/gitea/model/MigrateRepoForm.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * MigrateRepoForm form for migrating repository
  */
 @ApiModel(description = "MigrateRepoForm form for migrating repository")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class MigrateRepoForm {
   @SerializedName("auth_password")
   private String authPassword = null;

src/main/java/io/gitea/model/Milestone.java

@@ -28,7 +28,7 @@ import org.threeten.bp.OffsetDateTime;
  * Milestone milestone is a collection of issues on one repository
  */
 @ApiModel(description = "Milestone milestone is a collection of issues on one repository")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Milestone {
   @SerializedName("closed_at")
   private OffsetDateTime closedAt = null;

src/main/java/io/gitea/model/Organization.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * Organization represents an organization
  */
 @ApiModel(description = "Organization represents an organization")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Organization {
   @SerializedName("avatar_url")
   private String avatarUrl = null;

src/main/java/io/gitea/model/PRBranchInfo.java

@@ -28,7 +28,7 @@ import java.io.IOException;
  * PRBranchInfo information about a branch
  */
 @ApiModel(description = "PRBranchInfo information about a branch")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class PRBranchInfo {
   @SerializedName("label")
   private String label = null;

src/main/java/io/gitea/model/PayloadCommit.java

@@ -30,7 +30,7 @@ import org.threeten.bp.OffsetDateTime;
  * PayloadCommit represents a commit
  */
 @ApiModel(description = "PayloadCommit represents a commit")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class PayloadCommit {
   @SerializedName("author")
   private PayloadUser author = null;

src/main/java/io/gitea/model/PayloadCommitVerification.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * PayloadCommitVerification represents the GPG verification of a commit
  */
 @ApiModel(description = "PayloadCommitVerification represents the GPG verification of a commit")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class PayloadCommitVerification {
   @SerializedName("payload")
   private String payload = null;

src/main/java/io/gitea/model/PayloadUser.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * PayloadUser represents the author or committer of a commit
  */
 @ApiModel(description = "PayloadUser represents the author or committer of a commit")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class PayloadUser {
   @SerializedName("email")
   private String email = null;

src/main/java/io/gitea/model/Permission.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * Permission represents a set of permissions
  */
 @ApiModel(description = "Permission represents a set of permissions")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Permission {
   @SerializedName("admin")
   private Boolean admin = null;

src/main/java/io/gitea/model/PublicKey.java

@@ -28,7 +28,7 @@ import org.threeten.bp.OffsetDateTime;
  * PublicKey publickey is a user key to push code to repository
  */
 @ApiModel(description = "PublicKey publickey is a user key to push code to repository")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class PublicKey {
   @SerializedName("created_at")
   private OffsetDateTime createdAt = null;

src/main/java/io/gitea/model/PullRequest.java

@@ -34,7 +34,7 @@ import org.threeten.bp.OffsetDateTime;
  * PullRequest represents a pull request
  */
 @ApiModel(description = "PullRequest represents a pull request")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class PullRequest {
   @SerializedName("assignee")
   private User assignee = null;

src/main/java/io/gitea/model/PullRequestMeta.java

@@ -28,7 +28,7 @@ import org.threeten.bp.OffsetDateTime;
  * PullRequestMeta PR info if an issue is a PR
  */
 @ApiModel(description = "PullRequestMeta PR info if an issue is a PR")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class PullRequestMeta {
   @SerializedName("merged")
   private Boolean merged = null;

src/main/java/io/gitea/model/Release.java

@@ -32,7 +32,7 @@ import org.threeten.bp.OffsetDateTime;
  * Release represents a repository release
  */
 @ApiModel(description = "Release represents a repository release")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Release {
   @SerializedName("assets")
   private List<Attachment> assets = null;

src/main/java/io/gitea/model/Repository.java

@@ -31,7 +31,7 @@ import org.threeten.bp.OffsetDateTime;
  * Repository represents a repository
  */
 @ApiModel(description = "Repository represents a repository")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Repository {
   @SerializedName("clone_url")
   private String cloneUrl = null;

src/main/java/io/gitea/model/SearchResults.java

@@ -30,7 +30,7 @@ import java.util.List;
  * SearchResults results of a successful search
  */
 @ApiModel(description = "SearchResults results of a successful search")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class SearchResults {
   @SerializedName("data")
   private List<Repository> data = null;

src/main/java/io/gitea/model/ServerVersion.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * ServerVersion wraps the version of the server
  */
 @ApiModel(description = "ServerVersion wraps the version of the server")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class ServerVersion {
   @SerializedName("version")
   private String version = null;

src/main/java/io/gitea/model/Status.java

@@ -29,7 +29,7 @@ import org.threeten.bp.OffsetDateTime;
  * Status holds a single Status of a single Commit
  */
 @ApiModel(description = "Status holds a single Status of a single Commit")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Status {
   @SerializedName("context")
   private String context = null;

src/main/java/io/gitea/model/Team.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * Team represents a team in an organization
  */
 @ApiModel(description = "Team represents a team in an organization")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class Team {
   @SerializedName("description")
   private String description = null;

src/main/java/io/gitea/model/TrackedTime.java

@@ -28,7 +28,7 @@ import org.threeten.bp.OffsetDateTime;
  * TrackedTime worked time for an issue / pr
  */
 @ApiModel(description = "TrackedTime worked time for an issue / pr")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class TrackedTime {
   @SerializedName("created")
   private OffsetDateTime created = null;

src/main/java/io/gitea/model/User.java

@@ -27,7 +27,7 @@ import java.io.IOException;
  * User represents a user
  */
 @ApiModel(description = "User represents a user")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class User {
   @SerializedName("avatar_url")
   private String avatarUrl = null;

src/main/java/io/gitea/model/UserSearchList.java

@@ -27,23 +27,23 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * UserList
+ * UserSearchList
  */
-@ApiModel(description = "UserList")
+@ApiModel(description = "UserSearchList")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
-public class UserList {
+public class UserSearchList {
   @SerializedName("data")
   private List<User> data = null;
 
   @SerializedName("ok")
   private Boolean ok = null;
 
-  public UserList data(List<User> data) {
+  public UserSearchList data(List<User> data) {
     this.data = data;
     return this;
   }
 
-  public UserList addDataItem(User dataItem) {
+  public UserSearchList addDataItem(User dataItem) {
     if (this.data == null) {
       this.data = new ArrayList<User>();
     }
@@ -64,7 +64,7 @@ public class UserList {
     this.data = data;
   }
 
-  public UserList ok(Boolean ok) {
+  public UserSearchList ok(Boolean ok) {
     this.ok = ok;
     return this;
   }
@@ -91,9 +91,9 @@ public class UserList {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-    UserList userList = (UserList) o;
+    UserSearchList userSearchList = (UserSearchList) o;
-    return Objects.equals(this.data, userList.data) &&
+    return Objects.equals(this.data, userSearchList.data) &&
-        Objects.equals(this.ok, userList.ok);
+        Objects.equals(this.ok, userSearchList.ok);
   }
 
   @Override
@@ -105,7 +105,7 @@ public class UserList {
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
-    sb.append("class UserList {\n");
+    sb.append("class UserSearchList {\n");
     
     sb.append("    data: ").append(toIndentedString(data)).append("\n");
     sb.append("    ok: ").append(toIndentedString(ok)).append("\n");

src/main/java/io/gitea/model/WatchInfo.java

@@ -28,7 +28,7 @@ import org.threeten.bp.OffsetDateTime;
  * WatchInfo represents an API watch status of one repository
  */
 @ApiModel(description = "WatchInfo represents an API watch status of one repository")
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T18:29:44.562+01:00")
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaClientCodegen", date = "2018-08-24T21:18:13.192+01:00")
 public class WatchInfo {
   @SerializedName("created_at")
   private OffsetDateTime createdAt = null;

src/test/java/io/gitea/api/OrganizationApiTest.java

@@ -22,7 +22,7 @@ import io.gitea.model.EditTeamOption;
 import io.gitea.model.Organization;
 import io.gitea.model.Repository;
 import io.gitea.model.Team;
-import io.gitea.model.UserList;
+import io.gitea.model.User;
 import org.junit.Test;
 import org.junit.Ignore;
 
@@ -368,7 +368,7 @@ public class OrganizationApiTest {
     @Test
     public void orgListMembersTest() throws ApiException {
         String org = null;
-        UserList response = api.orgListMembers(org);
+        List<User> response = api.orgListMembers(org);
 
         // TODO: test validations
     }
@@ -384,7 +384,7 @@ public class OrganizationApiTest {
     @Test
     public void orgListPublicMembersTest() throws ApiException {
         String org = null;
-        UserList response = api.orgListPublicMembers(org);
+        List<User> response = api.orgListPublicMembers(org);
 
         // TODO: test validations
     }
@@ -416,7 +416,7 @@ public class OrganizationApiTest {
     @Test
     public void orgListTeamMembersTest() throws ApiException {
         Integer id = null;
-        UserList response = api.orgListTeamMembers(id);
+        List<User> response = api.orgListTeamMembers(id);
 
         // TODO: test validations
     }

src/test/java/io/gitea/api/RepositoryApiTest.java

@@ -37,7 +37,7 @@ import io.gitea.model.Repository;
 import io.gitea.model.SearchResults;
 import io.gitea.model.Status;
 import io.gitea.model.TrackedTime;
-import io.gitea.model.UserList;
+import io.gitea.model.User;
 import io.gitea.model.WatchInfo;
 import org.junit.Test;
 import org.junit.Ignore;
@@ -683,7 +683,7 @@ public class RepositoryApiTest {
     public void repoListCollaboratorsTest() throws ApiException {
         String owner = null;
         String repo = null;
-        UserList response = api.repoListCollaborators(owner, repo);
+        List<User> response = api.repoListCollaborators(owner, repo);
 
         // TODO: test validations
     }
@@ -786,7 +786,7 @@ public class RepositoryApiTest {
     public void repoListStargazersTest() throws ApiException {
         String owner = null;
         String repo = null;
-        UserList response = api.repoListStargazers(owner, repo);
+        List<User> response = api.repoListStargazers(owner, repo);
 
         // TODO: test validations
     }
@@ -821,7 +821,7 @@ public class RepositoryApiTest {
     public void repoListSubscribersTest() throws ApiException {
         String owner = null;
         String repo = null;
-        UserList response = api.repoListSubscribers(owner, repo);
+        List<User> response = api.repoListSubscribers(owner, repo);
 
         // TODO: test validations
     }

src/test/java/io/gitea/api/UserApiTest.java

@@ -25,7 +25,7 @@ import io.gitea.model.PublicKey;
 import io.gitea.model.Repository;
 import io.gitea.model.TrackedTime;
 import io.gitea.model.User;
-import io.gitea.model.UserList;
+import io.gitea.model.UserSearchList;
 import org.junit.Test;
 import org.junit.Ignore;
 
@@ -248,7 +248,7 @@ public class UserApiTest {
      */
     @Test
     public void userCurrentListFollowersTest() throws ApiException {
-        UserList response = api.userCurrentListFollowers();
+        List<User> response = api.userCurrentListFollowers();
 
         // TODO: test validations
     }
@@ -263,7 +263,7 @@ public class UserApiTest {
      */
     @Test
     public void userCurrentListFollowingTest() throws ApiException {
-        UserList response = api.userCurrentListFollowing();
+        List<User> response = api.userCurrentListFollowing();
 
         // TODO: test validations
     }
@@ -529,7 +529,7 @@ public class UserApiTest {
     @Test
     public void userListFollowersTest() throws ApiException {
         String username = null;
-        UserList response = api.userListFollowers(username);
+        List<User> response = api.userListFollowers(username);
 
         // TODO: test validations
     }
@@ -545,7 +545,7 @@ public class UserApiTest {
     @Test
     public void userListFollowingTest() throws ApiException {
         String username = null;
-        UserList response = api.userListFollowing(username);
+        List<User> response = api.userListFollowing(username);
 
         // TODO: test validations
     }
@@ -642,7 +642,7 @@ public class UserApiTest {
     public void userSearchTest() throws ApiException {
         String q = null;
         Integer limit = null;
-        UserList response = api.userSearch(q, limit);
+        UserSearchList response = api.userSearch(q, limit);
 
         // TODO: test validations
     }

swagger.v1.json

@@ -5190,7 +5190,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/UserList"
+            "$ref": "#/responses/UserSearchList"
           }
         }
       }
@@ -7554,8 +7554,8 @@
       },
       "x-go-package": "code.gitea.io/gitea/vendor/code.gitea.io/sdk/gitea"
     },
-    "UserList": {
+    "UserSearchList": {
-      "description": "UserList",
+      "description": "UserSearchList",
       "type": "object",
       "properties": {
         "data": {
@@ -7920,7 +7920,16 @@
     "UserList": {
       "description": "UserList",
       "schema": {
-        "$ref": "#/definitions/UserList"
+        "type": "array",
+        "items": {
+          "$ref": "#/definitions/User"
+        }
+      }
+    },
+    "UserSearchList": {
+      "description": "UserSearchList",
+      "schema": {
+        "$ref": "#/definitions/UserSearchList"
       }
     },
     "WatchInfo": {