diff --git a/samples/client/petstore/java/retrofit/gradlew.bat b/samples/client/petstore/java/retrofit/gradlew.bat index 72d362dafd8..5f192121eb4 100644 --- a/samples/client/petstore/java/retrofit/gradlew.bat +++ b/samples/client/petstore/java/retrofit/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@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 Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@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. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -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 - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@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 Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@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. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +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 + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java index e1c4644feea..0f8f3975814 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java @@ -8,8 +8,8 @@ import retrofit.mime.*; import io.swagger.client.model.Client; import org.joda.time.LocalDate; -import java.math.BigDecimal; import org.joda.time.DateTime; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; @@ -27,12 +27,7 @@ public interface FakeApi { @PATCH("/fake") Client testClientModel( - - - -@retrofit.http.Body Client body - - + @retrofit.http.Body Client body ); /** @@ -45,12 +40,7 @@ public interface FakeApi { @PATCH("/fake") void testClientModel( - - - -@retrofit.http.Body Client body - -, Callback cb + @retrofit.http.Body Client body, Callback cb ); /** * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -76,77 +66,7 @@ public interface FakeApi { @retrofit.http.FormUrlEncoded @POST("/fake") Void testEndpointParameters( - - - - -@retrofit.http.Field("number") BigDecimal number -, - - - -@retrofit.http.Field("double") Double _double -, - - - -@retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter -, - - - -@retrofit.http.Field("byte") byte[] _byte -, - - - -@retrofit.http.Field("integer") Integer integer -, - - - -@retrofit.http.Field("int32") Integer int32 -, - - - -@retrofit.http.Field("int64") Long int64 -, - - - -@retrofit.http.Field("float") Float _float -, - - - -@retrofit.http.Field("string") String string -, - - - -@retrofit.http.Field("binary") byte[] binary -, - - - -@retrofit.http.Field("date") LocalDate date -, - - - -@retrofit.http.Field("dateTime") DateTime dateTime -, - - - -@retrofit.http.Field("password") String password -, - - - -@retrofit.http.Field("callback") String paramCallback - + @retrofit.http.Field("number") BigDecimal number, @retrofit.http.Field("double") Double _double, @retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit.http.Field("byte") byte[] _byte, @retrofit.http.Field("integer") Integer integer, @retrofit.http.Field("int32") Integer int32, @retrofit.http.Field("int64") Long int64, @retrofit.http.Field("float") Float _float, @retrofit.http.Field("string") String string, @retrofit.http.Field("binary") byte[] binary, @retrofit.http.Field("date") LocalDate date, @retrofit.http.Field("dateTime") DateTime dateTime, @retrofit.http.Field("password") String password, @retrofit.http.Field("callback") String paramCallback ); /** @@ -173,77 +93,7 @@ public interface FakeApi { @retrofit.http.FormUrlEncoded @POST("/fake") void testEndpointParameters( - - - - -@retrofit.http.Field("number") BigDecimal number -, - - - -@retrofit.http.Field("double") Double _double -, - - - -@retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter -, - - - -@retrofit.http.Field("byte") byte[] _byte -, - - - -@retrofit.http.Field("integer") Integer integer -, - - - -@retrofit.http.Field("int32") Integer int32 -, - - - -@retrofit.http.Field("int64") Long int64 -, - - - -@retrofit.http.Field("float") Float _float -, - - - -@retrofit.http.Field("string") String string -, - - - -@retrofit.http.Field("binary") byte[] binary -, - - - -@retrofit.http.Field("date") LocalDate date -, - - - -@retrofit.http.Field("dateTime") DateTime dateTime -, - - - -@retrofit.http.Field("password") String password -, - - - -@retrofit.http.Field("callback") String paramCallback -, Callback cb + @retrofit.http.Field("number") BigDecimal number, @retrofit.http.Field("double") Double _double, @retrofit.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit.http.Field("byte") byte[] _byte, @retrofit.http.Field("integer") Integer integer, @retrofit.http.Field("int32") Integer int32, @retrofit.http.Field("int64") Long int64, @retrofit.http.Field("float") Float _float, @retrofit.http.Field("string") String string, @retrofit.http.Field("binary") byte[] binary, @retrofit.http.Field("date") LocalDate date, @retrofit.http.Field("dateTime") DateTime dateTime, @retrofit.http.Field("password") String password, @retrofit.http.Field("callback") String paramCallback, Callback cb ); /** * To test enum parameters @@ -263,47 +113,7 @@ public interface FakeApi { @retrofit.http.FormUrlEncoded @GET("/fake") Void testEnumParameters( - - - - -@retrofit.http.Field("enum_form_string_array") List enumFormStringArray -, - - - -@retrofit.http.Field("enum_form_string") String enumFormString -, - -@retrofit.http.Header("enum_header_string_array") List enumHeaderStringArray - - -, - -@retrofit.http.Header("enum_header_string") String enumHeaderString - - -, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray - - - - -, @retrofit.http.Query("enum_query_string") String enumQueryString - - - - -, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger - - - - -, - - - -@retrofit.http.Field("enum_query_double") Double enumQueryDouble - + @retrofit.http.Field("enum_form_string_array") List enumFormStringArray, @retrofit.http.Field("enum_form_string") String enumFormString, @retrofit.http.Header("enum_header_string_array") List enumHeaderStringArray, @retrofit.http.Header("enum_header_string") String enumHeaderString, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit.http.Query("enum_query_string") String enumQueryString, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger, @retrofit.http.Field("enum_query_double") Double enumQueryDouble ); /** @@ -324,46 +134,6 @@ public interface FakeApi { @retrofit.http.FormUrlEncoded @GET("/fake") void testEnumParameters( - - - - -@retrofit.http.Field("enum_form_string_array") List enumFormStringArray -, - - - -@retrofit.http.Field("enum_form_string") String enumFormString -, - -@retrofit.http.Header("enum_header_string_array") List enumHeaderStringArray - - -, - -@retrofit.http.Header("enum_header_string") String enumHeaderString - - -, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray - - - - -, @retrofit.http.Query("enum_query_string") String enumQueryString - - - - -, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger - - - - -, - - - -@retrofit.http.Field("enum_query_double") Double enumQueryDouble -, Callback cb + @retrofit.http.Field("enum_form_string_array") List enumFormStringArray, @retrofit.http.Field("enum_form_string") String enumFormString, @retrofit.http.Header("enum_header_string_array") List enumHeaderStringArray, @retrofit.http.Header("enum_header_string") String enumHeaderString, @retrofit.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit.http.Query("enum_query_string") String enumQueryString, @retrofit.http.Query("enum_query_integer") BigDecimal enumQueryInteger, @retrofit.http.Field("enum_query_double") Double enumQueryDouble, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java index eaeb49ffba4..eaaac18845f 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java @@ -7,8 +7,8 @@ import retrofit.http.*; import retrofit.mime.*; import io.swagger.client.model.Pet; -import io.swagger.client.model.ModelApiResponse; import java.io.File; +import io.swagger.client.model.ModelApiResponse; import java.util.ArrayList; import java.util.HashMap; @@ -26,12 +26,7 @@ public interface PetApi { @POST("/pet") Void addPet( - - - -@retrofit.http.Body Pet body - - + @retrofit.http.Body Pet body ); /** @@ -44,12 +39,7 @@ public interface PetApi { @POST("/pet") void addPet( - - - -@retrofit.http.Body Pet body - -, Callback cb + @retrofit.http.Body Pet body, Callback cb ); /** * Deletes a pet @@ -62,17 +52,7 @@ public interface PetApi { @DELETE("/pet/{petId}") Void deletePet( - -@retrofit.http.Path("petId") Long petId - - - -, - -@retrofit.http.Header("api_key") String apiKey - - - + @retrofit.http.Path("petId") Long petId, @retrofit.http.Header("api_key") String apiKey ); /** @@ -86,17 +66,7 @@ public interface PetApi { @DELETE("/pet/{petId}") void deletePet( - -@retrofit.http.Path("petId") Long petId - - - -, - -@retrofit.http.Header("api_key") String apiKey - - -, Callback cb + @retrofit.http.Path("petId") Long petId, @retrofit.http.Header("api_key") String apiKey, Callback cb ); /** * Finds Pets by status @@ -109,11 +79,6 @@ public interface PetApi { @GET("/pet/findByStatus") List findPetsByStatus( @retrofit.http.Query("status") CSVParams status - - - - - ); /** @@ -126,12 +91,7 @@ public interface PetApi { @GET("/pet/findByStatus") void findPetsByStatus( - @retrofit.http.Query("status") CSVParams status - - - - -, Callback> cb + @retrofit.http.Query("status") CSVParams status, Callback> cb ); /** * Finds Pets by tags @@ -144,11 +104,6 @@ public interface PetApi { @GET("/pet/findByTags") List findPetsByTags( @retrofit.http.Query("tags") CSVParams tags - - - - - ); /** @@ -161,12 +116,7 @@ public interface PetApi { @GET("/pet/findByTags") void findPetsByTags( - @retrofit.http.Query("tags") CSVParams tags - - - - -, Callback> cb + @retrofit.http.Query("tags") CSVParams tags, Callback> cb ); /** * Find pet by ID @@ -178,12 +128,7 @@ public interface PetApi { @GET("/pet/{petId}") Pet getPetById( - -@retrofit.http.Path("petId") Long petId - - - - + @retrofit.http.Path("petId") Long petId ); /** @@ -196,12 +141,7 @@ public interface PetApi { @GET("/pet/{petId}") void getPetById( - -@retrofit.http.Path("petId") Long petId - - - -, Callback cb + @retrofit.http.Path("petId") Long petId, Callback cb ); /** * Update an existing pet @@ -213,12 +153,7 @@ public interface PetApi { @PUT("/pet") Void updatePet( - - - -@retrofit.http.Body Pet body - - + @retrofit.http.Body Pet body ); /** @@ -231,12 +166,7 @@ public interface PetApi { @PUT("/pet") void updatePet( - - - -@retrofit.http.Body Pet body - -, Callback cb + @retrofit.http.Body Pet body, Callback cb ); /** * Updates a pet in the store with form data @@ -251,22 +181,7 @@ public interface PetApi { @retrofit.http.FormUrlEncoded @POST("/pet/{petId}") Void updatePetWithForm( - -@retrofit.http.Path("petId") Long petId - - - -, - - - -@retrofit.http.Field("name") String name -, - - - -@retrofit.http.Field("status") String status - + @retrofit.http.Path("petId") Long petId, @retrofit.http.Field("name") String name, @retrofit.http.Field("status") String status ); /** @@ -282,22 +197,7 @@ public interface PetApi { @retrofit.http.FormUrlEncoded @POST("/pet/{petId}") void updatePetWithForm( - -@retrofit.http.Path("petId") Long petId - - - -, - - - -@retrofit.http.Field("name") String name -, - - - -@retrofit.http.Field("status") String status -, Callback cb + @retrofit.http.Path("petId") Long petId, @retrofit.http.Field("name") String name, @retrofit.http.Field("status") String status, Callback cb ); /** * uploads an image @@ -312,22 +212,7 @@ public interface PetApi { @retrofit.http.Multipart @POST("/pet/{petId}/uploadImage") ModelApiResponse uploadFile( - -@retrofit.http.Path("petId") Long petId - - - -, - - - -@retrofit.http.Part("additionalMetadata") String additionalMetadata -, - - - -@retrofit.http.Part("file") TypedFile file - + @retrofit.http.Path("petId") Long petId, @retrofit.http.Part("additionalMetadata") String additionalMetadata, @retrofit.http.Part("file") TypedFile file ); /** @@ -343,21 +228,6 @@ public interface PetApi { @retrofit.http.Multipart @POST("/pet/{petId}/uploadImage") void uploadFile( - -@retrofit.http.Path("petId") Long petId - - - -, - - - -@retrofit.http.Part("additionalMetadata") String additionalMetadata -, - - - -@retrofit.http.Part("file") TypedFile file -, Callback cb + @retrofit.http.Path("petId") Long petId, @retrofit.http.Part("additionalMetadata") String additionalMetadata, @retrofit.http.Part("file") TypedFile file, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java index f9fed4bd1ce..c29f87ef9cc 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/StoreApi.java @@ -24,12 +24,7 @@ public interface StoreApi { @DELETE("/store/order/{orderId}") Void deleteOrder( - -@retrofit.http.Path("orderId") String orderId - - - - + @retrofit.http.Path("orderId") String orderId ); /** @@ -42,12 +37,7 @@ public interface StoreApi { @DELETE("/store/order/{orderId}") void deleteOrder( - -@retrofit.http.Path("orderId") String orderId - - - -, Callback cb + @retrofit.http.Path("orderId") String orderId, Callback cb ); /** * Returns pet inventories by status @@ -81,12 +71,7 @@ public interface StoreApi { @GET("/store/order/{orderId}") Order getOrderById( - -@retrofit.http.Path("orderId") Long orderId - - - - + @retrofit.http.Path("orderId") Long orderId ); /** @@ -99,12 +84,7 @@ public interface StoreApi { @GET("/store/order/{orderId}") void getOrderById( - -@retrofit.http.Path("orderId") Long orderId - - - -, Callback cb + @retrofit.http.Path("orderId") Long orderId, Callback cb ); /** * Place an order for a pet @@ -116,12 +96,7 @@ public interface StoreApi { @POST("/store/order") Order placeOrder( - - - -@retrofit.http.Body Order body - - + @retrofit.http.Body Order body ); /** @@ -134,11 +109,6 @@ public interface StoreApi { @POST("/store/order") void placeOrder( - - - -@retrofit.http.Body Order body - -, Callback cb + @retrofit.http.Body Order body, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java index 7de0bc3fb1a..43876970c3f 100644 --- a/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/UserApi.java @@ -24,12 +24,7 @@ public interface UserApi { @POST("/user") Void createUser( - - - -@retrofit.http.Body User body - - + @retrofit.http.Body User body ); /** @@ -42,12 +37,7 @@ public interface UserApi { @POST("/user") void createUser( - - - -@retrofit.http.Body User body - -, Callback cb + @retrofit.http.Body User body, Callback cb ); /** * Creates list of users with given input array @@ -59,12 +49,7 @@ public interface UserApi { @POST("/user/createWithArray") Void createUsersWithArrayInput( - - - -@retrofit.http.Body List body - - + @retrofit.http.Body List body ); /** @@ -77,12 +62,7 @@ public interface UserApi { @POST("/user/createWithArray") void createUsersWithArrayInput( - - - -@retrofit.http.Body List body - -, Callback cb + @retrofit.http.Body List body, Callback cb ); /** * Creates list of users with given input array @@ -94,12 +74,7 @@ public interface UserApi { @POST("/user/createWithList") Void createUsersWithListInput( - - - -@retrofit.http.Body List body - - + @retrofit.http.Body List body ); /** @@ -112,12 +87,7 @@ public interface UserApi { @POST("/user/createWithList") void createUsersWithListInput( - - - -@retrofit.http.Body List body - -, Callback cb + @retrofit.http.Body List body, Callback cb ); /** * Delete user @@ -129,12 +99,7 @@ public interface UserApi { @DELETE("/user/{username}") Void deleteUser( - -@retrofit.http.Path("username") String username - - - - + @retrofit.http.Path("username") String username ); /** @@ -147,12 +112,7 @@ public interface UserApi { @DELETE("/user/{username}") void deleteUser( - -@retrofit.http.Path("username") String username - - - -, Callback cb + @retrofit.http.Path("username") String username, Callback cb ); /** * Get user by user name @@ -164,12 +124,7 @@ public interface UserApi { @GET("/user/{username}") User getUserByName( - -@retrofit.http.Path("username") String username - - - - + @retrofit.http.Path("username") String username ); /** @@ -182,12 +137,7 @@ public interface UserApi { @GET("/user/{username}") void getUserByName( - -@retrofit.http.Path("username") String username - - - -, Callback cb + @retrofit.http.Path("username") String username, Callback cb ); /** * Logs user into the system @@ -200,17 +150,7 @@ public interface UserApi { @GET("/user/login") String loginUser( - @retrofit.http.Query("username") String username - - - - -, @retrofit.http.Query("password") String password - - - - - + @retrofit.http.Query("username") String username, @retrofit.http.Query("password") String password ); /** @@ -224,17 +164,7 @@ public interface UserApi { @GET("/user/login") void loginUser( - @retrofit.http.Query("username") String username - - - - -, @retrofit.http.Query("password") String password - - - - -, Callback cb + @retrofit.http.Query("username") String username, @retrofit.http.Query("password") String password, Callback cb ); /** * Logs out current logged in user session @@ -269,17 +199,7 @@ public interface UserApi { @PUT("/user/{username}") Void updateUser( - -@retrofit.http.Path("username") String username - - - -, - - -@retrofit.http.Body User body - - + @retrofit.http.Path("username") String username, @retrofit.http.Body User body ); /** @@ -293,16 +213,6 @@ public interface UserApi { @PUT("/user/{username}") void updateUser( - -@retrofit.http.Path("username") String username - - - -, - - -@retrofit.http.Body User body - -, Callback cb + @retrofit.http.Path("username") String username, @retrofit.http.Body User body, Callback cb ); } diff --git a/samples/client/petstore/java/retrofit2/gradlew.bat b/samples/client/petstore/java/retrofit2/gradlew.bat index 72d362dafd8..5f192121eb4 100644 --- a/samples/client/petstore/java/retrofit2/gradlew.bat +++ b/samples/client/petstore/java/retrofit2/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@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 Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@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. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -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 - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@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 Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@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. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +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 + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java index 7479e230574..d1068513f0e 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java @@ -10,8 +10,8 @@ import okhttp3.RequestBody; import io.swagger.client.model.Client; import org.joda.time.LocalDate; -import java.math.BigDecimal; import org.joda.time.DateTime; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; @@ -28,12 +28,7 @@ public interface FakeApi { @PATCH("fake") Call testClientModel( - - - -@retrofit2.http.Body Client body - - + @retrofit2.http.Body Client body ); /** @@ -59,77 +54,7 @@ public interface FakeApi { @retrofit2.http.FormUrlEncoded @POST("fake") Call testEndpointParameters( - - - - -@retrofit2.http.Field("number") BigDecimal number -, - - - -@retrofit2.http.Field("double") Double _double -, - - - -@retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter -, - - - -@retrofit2.http.Field("byte") byte[] _byte -, - - - -@retrofit2.http.Field("integer") Integer integer -, - - - -@retrofit2.http.Field("int32") Integer int32 -, - - - -@retrofit2.http.Field("int64") Long int64 -, - - - -@retrofit2.http.Field("float") Float _float -, - - - -@retrofit2.http.Field("string") String string -, - - - -@retrofit2.http.Field("binary") byte[] binary -, - - - -@retrofit2.http.Field("date") LocalDate date -, - - - -@retrofit2.http.Field("dateTime") DateTime dateTime -, - - - -@retrofit2.http.Field("password") String password -, - - - -@retrofit2.http.Field("callback") String paramCallback - + @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") byte[] binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") DateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback ); /** @@ -149,47 +74,7 @@ public interface FakeApi { @retrofit2.http.FormUrlEncoded @GET("fake") Call testEnumParameters( - - - - -@retrofit2.http.Field("enum_form_string_array") List enumFormStringArray -, - - - -@retrofit2.http.Field("enum_form_string") String enumFormString -, - -@retrofit2.http.Header("enum_header_string_array") List enumHeaderStringArray - - -, - -@retrofit2.http.Header("enum_header_string") String enumHeaderString - - -, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray - - - - -, @retrofit2.http.Query("enum_query_string") String enumQueryString - - - - -, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger - - - - -, - - - -@retrofit2.http.Field("enum_query_double") Double enumQueryDouble - + @retrofit2.http.Field("enum_form_string_array") List enumFormStringArray, @retrofit2.http.Field("enum_form_string") String enumFormString, @retrofit2.http.Header("enum_header_string_array") List enumHeaderStringArray, @retrofit2.http.Header("enum_header_string") String enumHeaderString, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit2.http.Query("enum_query_string") String enumQueryString, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger, @retrofit2.http.Field("enum_query_double") Double enumQueryDouble ); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java index bd13312f581..3f61279a66b 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/PetApi.java @@ -9,8 +9,8 @@ import retrofit2.http.*; import okhttp3.RequestBody; import io.swagger.client.model.Pet; -import io.swagger.client.model.ModelApiResponse; import java.io.File; +import io.swagger.client.model.ModelApiResponse; import java.util.ArrayList; import java.util.HashMap; @@ -27,12 +27,7 @@ public interface PetApi { @POST("pet") Call addPet( - - - -@retrofit2.http.Body Pet body - - + @retrofit2.http.Body Pet body ); /** @@ -45,17 +40,7 @@ public interface PetApi { @DELETE("pet/{petId}") Call deletePet( - -@retrofit2.http.Path("petId") Long petId - - - -, - -@retrofit2.http.Header("api_key") String apiKey - - - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Header("api_key") String apiKey ); /** @@ -68,11 +53,6 @@ public interface PetApi { @GET("pet/findByStatus") Call> findPetsByStatus( @retrofit2.http.Query("status") CSVParams status - - - - - ); /** @@ -85,11 +65,6 @@ public interface PetApi { @GET("pet/findByTags") Call> findPetsByTags( @retrofit2.http.Query("tags") CSVParams tags - - - - - ); /** @@ -101,12 +76,7 @@ public interface PetApi { @GET("pet/{petId}") Call getPetById( - -@retrofit2.http.Path("petId") Long petId - - - - + @retrofit2.http.Path("petId") Long petId ); /** @@ -118,12 +88,7 @@ public interface PetApi { @PUT("pet") Call updatePet( - - - -@retrofit2.http.Body Pet body - - + @retrofit2.http.Body Pet body ); /** @@ -138,22 +103,7 @@ public interface PetApi { @retrofit2.http.FormUrlEncoded @POST("pet/{petId}") Call updatePetWithForm( - -@retrofit2.http.Path("petId") Long petId - - - -, - - - -@retrofit2.http.Field("name") String name -, - - - -@retrofit2.http.Field("status") String status - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Field("name") String name, @retrofit2.http.Field("status") String status ); /** @@ -168,22 +118,7 @@ public interface PetApi { @retrofit2.http.Multipart @POST("pet/{petId}/uploadImage") Call uploadFile( - -@retrofit2.http.Path("petId") Long petId - - - -, - - - -@retrofit2.http.Part("additionalMetadata") String additionalMetadata -, - - - -@retrofit2.http.Part("file\"; filename=\"file") RequestBody file - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file\"; filename=\"file") RequestBody file ); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java index ebed8da8f52..f9df7d8e8d6 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/StoreApi.java @@ -25,12 +25,7 @@ public interface StoreApi { @DELETE("store/order/{orderId}") Call deleteOrder( - -@retrofit2.http.Path("orderId") String orderId - - - - + @retrofit2.http.Path("orderId") String orderId ); /** @@ -52,12 +47,7 @@ public interface StoreApi { @GET("store/order/{orderId}") Call getOrderById( - -@retrofit2.http.Path("orderId") Long orderId - - - - + @retrofit2.http.Path("orderId") Long orderId ); /** @@ -69,12 +59,7 @@ public interface StoreApi { @POST("store/order") Call placeOrder( - - - -@retrofit2.http.Body Order body - - + @retrofit2.http.Body Order body ); } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java index 1bf7d34d73c..ee1114dc2dc 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/UserApi.java @@ -25,12 +25,7 @@ public interface UserApi { @POST("user") Call createUser( - - - -@retrofit2.http.Body User body - - + @retrofit2.http.Body User body ); /** @@ -42,12 +37,7 @@ public interface UserApi { @POST("user/createWithArray") Call createUsersWithArrayInput( - - - -@retrofit2.http.Body List body - - + @retrofit2.http.Body List body ); /** @@ -59,12 +49,7 @@ public interface UserApi { @POST("user/createWithList") Call createUsersWithListInput( - - - -@retrofit2.http.Body List body - - + @retrofit2.http.Body List body ); /** @@ -76,12 +61,7 @@ public interface UserApi { @DELETE("user/{username}") Call deleteUser( - -@retrofit2.http.Path("username") String username - - - - + @retrofit2.http.Path("username") String username ); /** @@ -93,12 +73,7 @@ public interface UserApi { @GET("user/{username}") Call getUserByName( - -@retrofit2.http.Path("username") String username - - - - + @retrofit2.http.Path("username") String username ); /** @@ -111,17 +86,7 @@ public interface UserApi { @GET("user/login") Call loginUser( - @retrofit2.http.Query("username") String username - - - - -, @retrofit2.http.Query("password") String password - - - - - + @retrofit2.http.Query("username") String username, @retrofit2.http.Query("password") String password ); /** @@ -144,17 +109,7 @@ public interface UserApi { @PUT("user/{username}") Call updateUser( - -@retrofit2.http.Path("username") String username - - - -, - - -@retrofit2.http.Body User body - - + @retrofit2.http.Path("username") String username, @retrofit2.http.Body User body ); } diff --git a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md index f4cfc7e19cc..2e2b792d8d3 100644 --- a/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md +++ b/samples/client/petstore/java/retrofit2rx/docs/FakeApi.md @@ -54,7 +54,7 @@ No authorization required # **testEndpointParameters** -> Void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password) +> Void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback) Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 @@ -90,8 +90,9 @@ byte[] binary = B; // byte[] | None LocalDate date = new LocalDate(); // LocalDate | None DateTime dateTime = new DateTime(); // DateTime | None String password = "password_example"; // String | None +String paramCallback = "paramCallback_example"; // String | None try { - Void result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password); + Void result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FakeApi#testEndpointParameters"); @@ -116,6 +117,7 @@ Name | Type | Description | Notes **date** | **LocalDate**| None | [optional] **dateTime** | **DateTime**| None | [optional] **password** | **String**| None | [optional] + **paramCallback** | **String**| None | [optional] ### Return type diff --git a/samples/client/petstore/java/retrofit2rx/gradlew.bat b/samples/client/petstore/java/retrofit2rx/gradlew.bat index 72d362dafd8..5f192121eb4 100644 --- a/samples/client/petstore/java/retrofit2rx/gradlew.bat +++ b/samples/client/petstore/java/retrofit2rx/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@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 Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@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. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -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 - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@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 Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@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. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +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 + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java index 924c81ff6dc..2b832afd1ef 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java @@ -10,8 +10,8 @@ import okhttp3.RequestBody; import io.swagger.client.model.Client; import org.joda.time.LocalDate; -import java.math.BigDecimal; import org.joda.time.DateTime; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; @@ -28,12 +28,7 @@ public interface FakeApi { @PATCH("fake") Observable testClientModel( - - - -@retrofit2.http.Body Client body - - + @retrofit2.http.Body Client body ); /** @@ -59,77 +54,7 @@ public interface FakeApi { @retrofit2.http.FormUrlEncoded @POST("fake") Observable testEndpointParameters( - - - - -@retrofit2.http.Field("number") BigDecimal number -, - - - -@retrofit2.http.Field("double") Double _double -, - - - -@retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter -, - - - -@retrofit2.http.Field("byte") byte[] _byte -, - - - -@retrofit2.http.Field("integer") Integer integer -, - - - -@retrofit2.http.Field("int32") Integer int32 -, - - - -@retrofit2.http.Field("int64") Long int64 -, - - - -@retrofit2.http.Field("float") Float _float -, - - - -@retrofit2.http.Field("string") String string -, - - - -@retrofit2.http.Field("binary") byte[] binary -, - - - -@retrofit2.http.Field("date") LocalDate date -, - - - -@retrofit2.http.Field("dateTime") DateTime dateTime -, - - - -@retrofit2.http.Field("password") String password -, - - - -@retrofit2.http.Field("callback") String paramCallback - + @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") byte[] binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") DateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback ); /** @@ -149,47 +74,7 @@ public interface FakeApi { @retrofit2.http.FormUrlEncoded @GET("fake") Observable testEnumParameters( - - - - -@retrofit2.http.Field("enum_form_string_array") List enumFormStringArray -, - - - -@retrofit2.http.Field("enum_form_string") String enumFormString -, - -@retrofit2.http.Header("enum_header_string_array") List enumHeaderStringArray - - -, - -@retrofit2.http.Header("enum_header_string") String enumHeaderString - - -, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray - - - - -, @retrofit2.http.Query("enum_query_string") String enumQueryString - - - - -, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger - - - - -, - - - -@retrofit2.http.Field("enum_query_double") Double enumQueryDouble - + @retrofit2.http.Field("enum_form_string_array") List enumFormStringArray, @retrofit2.http.Field("enum_form_string") String enumFormString, @retrofit2.http.Header("enum_header_string_array") List enumHeaderStringArray, @retrofit2.http.Header("enum_header_string") String enumHeaderString, @retrofit2.http.Query("enum_query_string_array") CSVParams enumQueryStringArray, @retrofit2.http.Query("enum_query_string") String enumQueryString, @retrofit2.http.Query("enum_query_integer") BigDecimal enumQueryInteger, @retrofit2.http.Field("enum_query_double") Double enumQueryDouble ); } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java index cc6a867c755..3c183bb08f9 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java @@ -9,8 +9,8 @@ import retrofit2.http.*; import okhttp3.RequestBody; import io.swagger.client.model.Pet; -import io.swagger.client.model.ModelApiResponse; import java.io.File; +import io.swagger.client.model.ModelApiResponse; import java.util.ArrayList; import java.util.HashMap; @@ -27,12 +27,7 @@ public interface PetApi { @POST("pet") Observable addPet( - - - -@retrofit2.http.Body Pet body - - + @retrofit2.http.Body Pet body ); /** @@ -45,17 +40,7 @@ public interface PetApi { @DELETE("pet/{petId}") Observable deletePet( - -@retrofit2.http.Path("petId") Long petId - - - -, - -@retrofit2.http.Header("api_key") String apiKey - - - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Header("api_key") String apiKey ); /** @@ -68,11 +53,6 @@ public interface PetApi { @GET("pet/findByStatus") Observable> findPetsByStatus( @retrofit2.http.Query("status") CSVParams status - - - - - ); /** @@ -85,11 +65,6 @@ public interface PetApi { @GET("pet/findByTags") Observable> findPetsByTags( @retrofit2.http.Query("tags") CSVParams tags - - - - - ); /** @@ -101,12 +76,7 @@ public interface PetApi { @GET("pet/{petId}") Observable getPetById( - -@retrofit2.http.Path("petId") Long petId - - - - + @retrofit2.http.Path("petId") Long petId ); /** @@ -118,12 +88,7 @@ public interface PetApi { @PUT("pet") Observable updatePet( - - - -@retrofit2.http.Body Pet body - - + @retrofit2.http.Body Pet body ); /** @@ -138,22 +103,7 @@ public interface PetApi { @retrofit2.http.FormUrlEncoded @POST("pet/{petId}") Observable updatePetWithForm( - -@retrofit2.http.Path("petId") Long petId - - - -, - - - -@retrofit2.http.Field("name") String name -, - - - -@retrofit2.http.Field("status") String status - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Field("name") String name, @retrofit2.http.Field("status") String status ); /** @@ -168,22 +118,7 @@ public interface PetApi { @retrofit2.http.Multipart @POST("pet/{petId}/uploadImage") Observable uploadFile( - -@retrofit2.http.Path("petId") Long petId - - - -, - - - -@retrofit2.http.Part("additionalMetadata") String additionalMetadata -, - - - -@retrofit2.http.Part("file\"; filename=\"file") RequestBody file - + @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file\"; filename=\"file") RequestBody file ); } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java index f763e317070..e8eac3c525b 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/StoreApi.java @@ -25,12 +25,7 @@ public interface StoreApi { @DELETE("store/order/{orderId}") Observable deleteOrder( - -@retrofit2.http.Path("orderId") String orderId - - - - + @retrofit2.http.Path("orderId") String orderId ); /** @@ -52,12 +47,7 @@ public interface StoreApi { @GET("store/order/{orderId}") Observable getOrderById( - -@retrofit2.http.Path("orderId") Long orderId - - - - + @retrofit2.http.Path("orderId") Long orderId ); /** @@ -69,12 +59,7 @@ public interface StoreApi { @POST("store/order") Observable placeOrder( - - - -@retrofit2.http.Body Order body - - + @retrofit2.http.Body Order body ); } diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java index 4f13893a8f8..579134971f8 100644 --- a/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/UserApi.java @@ -25,12 +25,7 @@ public interface UserApi { @POST("user") Observable createUser( - - - -@retrofit2.http.Body User body - - + @retrofit2.http.Body User body ); /** @@ -42,12 +37,7 @@ public interface UserApi { @POST("user/createWithArray") Observable createUsersWithArrayInput( - - - -@retrofit2.http.Body List body - - + @retrofit2.http.Body List body ); /** @@ -59,12 +49,7 @@ public interface UserApi { @POST("user/createWithList") Observable createUsersWithListInput( - - - -@retrofit2.http.Body List body - - + @retrofit2.http.Body List body ); /** @@ -76,12 +61,7 @@ public interface UserApi { @DELETE("user/{username}") Observable deleteUser( - -@retrofit2.http.Path("username") String username - - - - + @retrofit2.http.Path("username") String username ); /** @@ -93,12 +73,7 @@ public interface UserApi { @GET("user/{username}") Observable getUserByName( - -@retrofit2.http.Path("username") String username - - - - + @retrofit2.http.Path("username") String username ); /** @@ -111,17 +86,7 @@ public interface UserApi { @GET("user/login") Observable loginUser( - @retrofit2.http.Query("username") String username - - - - -, @retrofit2.http.Query("password") String password - - - - - + @retrofit2.http.Query("username") String username, @retrofit2.http.Query("password") String password ); /** @@ -144,17 +109,7 @@ public interface UserApi { @PUT("user/{username}") Observable updateUser( - -@retrofit2.http.Path("username") String username - - - -, - - -@retrofit2.http.Body User body - - + @retrofit2.http.Path("username") String username, @retrofit2.http.Body User body ); }