0.0.9 - File upload fixes

Author: winrid

client/README.md

@@ -40,7 +40,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>com.fastcomments</groupId>
   <artifactId>client</artifactId>
-  <version>0.0.8</version>
+  <version>0.0.9</version>
   <scope>compile</scope>
 </dependency>
 ```
@@ -56,7 +56,7 @@ Add this dependency to your project's build file:
   }
 
   dependencies {
-     implementation "com.fastcomments:client:0.0.8"
+     implementation "com.fastcomments:client:0.0.9"
   }
 ```
 
@@ -70,7 +70,7 @@ mvn clean package
 
 Then manually install the following JARs:
 
-* `target/client-0.0.8.jar`
+* `target/client-0.0.9.jar`
 * `target/lib/*.jar`
 
 ## Getting Started

client/api/openapi.yaml

@@ -457,8 +457,7 @@ paths:
       description: Upload and resize an image
       operationId: UploadImage
       parameters:
-      - description: Tenant ID
-        explode: false
+      - explode: false
         in: path
         name: tenantId
         required: true
@@ -482,6 +481,12 @@ paths:
         schema:
           type: string
         style: form
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/UploadImage_request'
+        required: true
       responses:
         "200":
           content:
@@ -492,6 +497,7 @@ paths:
       security: []
       tags:
       - Public
+      x-content-type: multipart/form-data
       x-accepts:
       - application/json
   /flag-comment/{commentId}:
@@ -7871,6 +7877,14 @@ components:
       - $ref: '#/components/schemas/UserNotificationWriteResponse'
       - $ref: '#/components/schemas/IgnoredResponse'
       - $ref: '#/components/schemas/APIError'
+    UploadImage_request:
+      properties:
+        file:
+          format: binary
+          type: string
+      required:
+      - file
+      type: object
     FlagCommentPublic_200_response:
       anyOf:
       - $ref: '#/components/schemas/APIEmptyResponse'

client/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'java'
 apply plugin: 'com.diffplug.spotless'
 
 group = 'com.fastcomments'
-version = '0.0.8'
+version = '0.0.9'
 
 buildscript {
     repositories {

client/build.sbt

@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
   settings(
     organization := "com.fastcomments",
     name := "client",
-    version := "0.0.8",
+    version := "0.0.9",
     scalaVersion := "2.11.4",
     scalacOptions ++= Seq("-feature"),
     javacOptions in compile ++= Seq("-Xlint:deprecation"),

client/docs/PublicApi.md

@@ -2153,7 +2153,7 @@ No authorization required
 
 <a id="uploadImage"></a>
 # **uploadImage**
-> UploadImageResponse uploadImage(tenantId).sizePreset(sizePreset).urlId(urlId).execute();
+> UploadImageResponse uploadImage(tenantId, _file).sizePreset(sizePreset).urlId(urlId).execute();
 
 
 
@@ -2174,11 +2174,12 @@ public class Example {
     defaultClient.setBasePath("http://localhost");
 
     PublicApi apiInstance = new PublicApi(defaultClient);
-    String tenantId = "tenantId_example"; // String | Tenant ID
+    String tenantId = "tenantId_example"; // String | 
+    File _file = new File("/path/to/file"); // File | 
     SizePreset sizePreset = SizePreset.fromValue("Default"); // SizePreset | Size preset: \"Default\" (1000x1000px) or \"CrossPlatform\" (creates sizes for popular devices)
     String urlId = "urlId_example"; // String | Page id that upload is happening from, to configure
     try {
-      UploadImageResponse result = apiInstance.uploadImage(tenantId)
+      UploadImageResponse result = apiInstance.uploadImage(tenantId, _file)
             .sizePreset(sizePreset)
             .urlId(urlId)
             .execute();
@@ -2198,7 +2199,8 @@ public class Example {
 
 | Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
-| **tenantId** | **String**| Tenant ID | |
+| **tenantId** | **String**|  | |
+| **_file** | **File**|  | |
 | **sizePreset** | [**SizePreset**](.md)| Size preset: \&quot;Default\&quot; (1000x1000px) or \&quot;CrossPlatform\&quot; (creates sizes for popular devices) | [optional] [enum: Default, CrossPlatform] |
 | **urlId** | **String**| Page id that upload is happening from, to configure | [optional] |
 
@@ -2212,7 +2214,7 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: Not defined
+ - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
 ### HTTP response details

client/pom.xml

@@ -5,7 +5,7 @@
     <artifactId>client</artifactId>
     <packaging>jar</packaging>
     <name>client</name>
-    <version>0.0.8</version>
+    <version>0.0.9</version>
     <url>https://fastcomments.com</url>
     <description>FastComments API Client - A SDK for interacting with the FastComments API</description>
     <scm>

client/src/main/java/com/fastcomments/api/PublicApi.java

@@ -37,6 +37,7 @@
 import com.fastcomments.model.CreateFeedPostPublic200Response;
 import com.fastcomments.model.DeleteCommentPublic200Response;
 import com.fastcomments.model.DeleteCommentVote200Response;
+import java.io.File;
 import com.fastcomments.model.FlagCommentPublic200Response;
 import com.fastcomments.model.GetCommentText200Response;
 import com.fastcomments.model.GetCommentVoteUserNames200Response;
@@ -6385,7 +6386,7 @@ public okhttp3.Call executeAsync(final ApiCallback<UpdateUserNotificationStatus2
     public APIupdateUserNotificationStatusRequest updateUserNotificationStatus(String tenantId, String notificationId, String newStatus) {
         return new APIupdateUserNotificationStatusRequest(tenantId, notificationId, newStatus);
     }
-    private okhttp3.Call uploadImageCall(String tenantId, SizePreset sizePreset, String urlId, final ApiCallback _callback) throws ApiException {
+    private okhttp3.Call uploadImageCall(String tenantId, File _file, SizePreset sizePreset, String urlId, final ApiCallback _callback) throws ApiException {
         String basePath = null;
         // Operation Servers
         String[] localBasePaths = new String[] {  };
@@ -6411,6 +6412,10 @@ private okhttp3.Call uploadImageCall(String tenantId, SizePreset sizePreset, Str
         Map<String, String> localVarCookieParams = new HashMap<String, String>();
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
+        if (_file != null) {
+            localVarFormParams.put("file", _file);
+        }
+
         if (sizePreset != null) {
             localVarQueryParams.addAll(localVarApiClient.parameterToPair("sizePreset", sizePreset));
         }
@@ -6428,6 +6433,7 @@ private okhttp3.Call uploadImageCall(String tenantId, SizePreset sizePreset, Str
         }
 
         final String[] localVarContentTypes = {
+            "multipart/form-data"
         };
         final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes);
         if (localVarContentType != null) {
@@ -6439,38 +6445,45 @@ private okhttp3.Call uploadImageCall(String tenantId, SizePreset sizePreset, Str
     }
 
     @SuppressWarnings("rawtypes")
-    private okhttp3.Call uploadImageValidateBeforeCall(String tenantId, SizePreset sizePreset, String urlId, final ApiCallback _callback) throws ApiException {
+    private okhttp3.Call uploadImageValidateBeforeCall(String tenantId, File _file, SizePreset sizePreset, String urlId, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'tenantId' is set
         if (tenantId == null) {
             throw new ApiException("Missing the required parameter 'tenantId' when calling uploadImage(Async)");
         }
 
-        return uploadImageCall(tenantId, sizePreset, urlId, _callback);
+        // verify the required parameter '_file' is set
+        if (_file == null) {
+            throw new ApiException("Missing the required parameter '_file' when calling uploadImage(Async)");
+        }
+
+        return uploadImageCall(tenantId, _file, sizePreset, urlId, _callback);
 
     }
 
 
-    private ApiResponse<UploadImageResponse> uploadImageWithHttpInfo(String tenantId, SizePreset sizePreset, String urlId) throws ApiException {
-        okhttp3.Call localVarCall = uploadImageValidateBeforeCall(tenantId, sizePreset, urlId, null);
+    private ApiResponse<UploadImageResponse> uploadImageWithHttpInfo(String tenantId, File _file, SizePreset sizePreset, String urlId) throws ApiException {
+        okhttp3.Call localVarCall = uploadImageValidateBeforeCall(tenantId, _file, sizePreset, urlId, null);
         Type localVarReturnType = new TypeToken<UploadImageResponse>(){}.getType();
         return localVarApiClient.execute(localVarCall, localVarReturnType);
     }
 
-    private okhttp3.Call uploadImageAsync(String tenantId, SizePreset sizePreset, String urlId, final ApiCallback<UploadImageResponse> _callback) throws ApiException {
+    private okhttp3.Call uploadImageAsync(String tenantId, File _file, SizePreset sizePreset, String urlId, final ApiCallback<UploadImageResponse> _callback) throws ApiException {
 
-        okhttp3.Call localVarCall = uploadImageValidateBeforeCall(tenantId, sizePreset, urlId, _callback);
+        okhttp3.Call localVarCall = uploadImageValidateBeforeCall(tenantId, _file, sizePreset, urlId, _callback);
         Type localVarReturnType = new TypeToken<UploadImageResponse>(){}.getType();
         localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback);
         return localVarCall;
     }
 
     public class APIuploadImageRequest {
         private final String tenantId;
+        private final File _file;
         private SizePreset sizePreset;
         private String urlId;
 
-        private APIuploadImageRequest(String tenantId) {
+        private APIuploadImageRequest(String tenantId, File _file) {
             this.tenantId = tenantId;
+            this._file = _file;
         }
 
         /**
@@ -6506,7 +6519,7 @@ public APIuploadImageRequest urlId(String urlId) {
          </table>
          */
         public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
-            return uploadImageCall(tenantId, sizePreset, urlId, _callback);
+            return uploadImageCall(tenantId, _file, sizePreset, urlId, _callback);
         }
 
         /**
@@ -6521,7 +6534,7 @@ public okhttp3.Call buildCall(final ApiCallback _callback) throws ApiException {
          </table>
          */
         public UploadImageResponse execute() throws ApiException {
-            ApiResponse<UploadImageResponse> localVarResp = uploadImageWithHttpInfo(tenantId, sizePreset, urlId);
+            ApiResponse<UploadImageResponse> localVarResp = uploadImageWithHttpInfo(tenantId, _file, sizePreset, urlId);
             return localVarResp.getData();
         }
 
@@ -6537,7 +6550,7 @@ public UploadImageResponse execute() throws ApiException {
          </table>
          */
         public ApiResponse<UploadImageResponse> executeWithHttpInfo() throws ApiException {
-            return uploadImageWithHttpInfo(tenantId, sizePreset, urlId);
+            return uploadImageWithHttpInfo(tenantId, _file, sizePreset, urlId);
         }
 
         /**
@@ -6553,14 +6566,15 @@ public ApiResponse<UploadImageResponse> executeWithHttpInfo() throws ApiExceptio
          </table>
          */
         public okhttp3.Call executeAsync(final ApiCallback<UploadImageResponse> _callback) throws ApiException {
-            return uploadImageAsync(tenantId, sizePreset, urlId, _callback);
+            return uploadImageAsync(tenantId, _file, sizePreset, urlId, _callback);
         }
     }
 
     /**
      * 
      * Upload and resize an image
-     * @param tenantId Tenant ID (required)
+     * @param tenantId  (required)
+     * @param _file  (required)
      * @return APIuploadImageRequest
      * @http.response.details
      <table border="1">
@@ -6569,8 +6583,8 @@ public okhttp3.Call executeAsync(final ApiCallback<UploadImageResponse> _callbac
         <tr><td> 200 </td><td> Ok </td><td>  -  </td></tr>
      </table>
      */
-    public APIuploadImageRequest uploadImage(String tenantId) {
-        return new APIuploadImageRequest(tenantId);
+    public APIuploadImageRequest uploadImage(String tenantId, File _file) {
+        return new APIuploadImageRequest(tenantId, _file);
     }
     private okhttp3.Call voteCommentCall(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, String sessionId, String sso, final ApiCallback _callback) throws ApiException {
         String basePath = null;

client/src/main/java/com/fastcomments/invoker/ApiClient.java

@@ -141,7 +141,7 @@ private void init() {
         json = new JSON();
 
         // Set default User-Agent.
-        setUserAgent("OpenAPI-Generator/0.0.8/java");
+        setUserAgent("OpenAPI-Generator/0.0.9/java");
 
         authentications = new HashMap<String, Authentication>();
     }

client/src/main/java/com/fastcomments/invoker/Configuration.java

@@ -15,7 +15,7 @@
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
 public class Configuration {
-    public static final String VERSION = "0.0.8";
+    public static final String VERSION = "0.0.9";
 
     private static ApiClient defaultApiClient = new ApiClient();
 

client/src/test/java/com/fastcomments/api/PublicApiTest.java

@@ -24,6 +24,7 @@
 import com.fastcomments.model.CreateFeedPostPublic200Response;
 import com.fastcomments.model.DeleteCommentPublic200Response;
 import com.fastcomments.model.DeleteCommentVote200Response;
+import java.io.File;
 import com.fastcomments.model.FlagCommentPublic200Response;
 import com.fastcomments.model.GetCommentText200Response;
 import com.fastcomments.model.GetCommentVoteUserNames200Response;
@@ -606,9 +607,10 @@ public void updateUserNotificationStatusTest() throws ApiException {
     @Test
     public void uploadImageTest() throws ApiException {
         String tenantId = null;
+        File _file = null;
         SizePreset sizePreset = null;
         String urlId = null;
-        UploadImageResponse response = api.uploadImage(tenantId)
+        UploadImageResponse response = api.uploadImage(tenantId, _file)
                 .sizePreset(sizePreset)
                 .urlId(urlId)
                 .execute();