small fixes to get image update working

Author: Jevgeni Koltšin

src/main/java/com/creatubbles/api/CreatubblesAPI.java

@@ -55,8 +55,7 @@ public static void main(String[] args) throws IOException {
         Creation creation = uploadResponse.creation;
         String relativePath = creation.store_dir + "/" + fileName;
         new UploadS3ImageRequest(data, relativePath).execute().getResponse();
-        Image img = new Image();
-        img.url = relativePath;
+        creation.url = relativePath;
         UpdateCreationResponse updateResponse = new UpdateCreationRequest(response.access_token, creation).execute().getResponse();
         System.exit(0);
     }

src/main/java/com/creatubbles/api/core/Creation.java

@@ -8,4 +8,5 @@ public class Creation {
     public Image image;
     public Creator[] creators;
     public String store_dir;
+    public String url;
 }

src/main/java/com/creatubbles/api/request/amazon/UploadS3ImageRequest.java

@@ -1,6 +1,7 @@
 package com.creatubbles.api.request.amazon;
 
 import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.CannedAccessControlList;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PutObjectRequest;
 import com.amazonaws.services.s3.model.PutObjectResult;
@@ -35,7 +36,8 @@ public CreatubblesRequest<UploadS3ImageResponse> execute() {
         AmazonS3 client = S3ClientUtil.getClient();
         ObjectMetadata metadata = new ObjectMetadata();
         metadata.setContentLength(data.length);
-        PutObjectRequest putObjectRequest = new PutObjectRequest(S3ClientUtil.AWS_S3_BUCKET_NAME, filePath, new ByteArrayInputStream(data), metadata);
+        PutObjectRequest putObjectRequest = new PutObjectRequest(S3ClientUtil.AWS_S3_BUCKET_NAME, filePath, new ByteArrayInputStream(data), metadata)
+                .withCannedAcl(CannedAccessControlList.PublicRead);
         client.putObject(putObjectRequest);
         return this;
     }

src/main/java/com/creatubbles/api/request/creation/UpdateCreationRequest.java

@@ -3,7 +3,6 @@
 import com.creatubbles.api.CreatubblesAPI;
 import com.creatubbles.api.core.Creation;
 import com.creatubbles.api.core.CreatubblesRequest;
-import com.creatubbles.api.core.Image;
 import com.creatubbles.api.response.creation.UpdateCreationResponse;
 import com.creatubbles.api.util.EndPoints;
 import com.creatubbles.api.util.HttpMethod;
@@ -18,9 +17,8 @@ public class UpdateCreationRequest extends CreatubblesRequest<UpdateCreationResp
     public UpdateCreationRequest(String accessToken, Creation creation) {
         super(String.format(EndPoints.CREATIONS_BY_ID, creation.id), HttpMethod.PUT, accessToken);
         JsonObject jsonObject = new JsonObject();
-        Image image = creation.image;
-        if (image != null && image.url != null && !image.url.startsWith("http")) {
-            image.url = S3ClientUtil.AWS_S3_BASE_URL + image.url;
+        if (creation.url != null && !creation.url.startsWith("http")) {
+            creation.url = S3ClientUtil.AWS_S3_BASE_URL + creation.url;
         }
         jsonObject.add("creation", CreatubblesAPI.GSON.toJsonTree(creation));
         setData(jsonObject.toString());