From b1bf616bb02a718ac4287dd57cac73388a2ef7c6 Mon Sep 17 00:00:00 2001 From: Raman Gupta Date: Wed, 1 Jun 2016 16:55:23 -0400 Subject: [PATCH] SavedImage supports extra params --- .../java/com/blitline/image/SavedImage.java | 39 ++++++++++++++++--- .../image/functions/TestSerializer.java | 3 ++ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/blitline-image-client/src/main/java/com/blitline/image/SavedImage.java b/blitline-image-client/src/main/java/com/blitline/image/SavedImage.java index 21250fd..d712475 100644 --- a/blitline-image-client/src/main/java/com/blitline/image/SavedImage.java +++ b/blitline-image-client/src/main/java/com/blitline/image/SavedImage.java @@ -4,8 +4,10 @@ import java.util.HashMap; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; @@ -30,11 +32,17 @@ public class SavedImage implements Serializable { public final S3Location s3Destination; public final AzureLocation azureDestination; + private final Map params; + public SavedImage(String imageIdentifier, Integer quality, boolean saveMetadata, boolean skip, S3Location s3Destination, AzureLocation azureDestination) { - this(imageIdentifier, quality, saveMetadata, skip, s3Destination, azureDestination, null); + this(imageIdentifier, quality, saveMetadata, skip, s3Destination, azureDestination, null, null); } public SavedImage(String imageIdentifier, Integer quality, boolean saveMetadata, boolean skip, S3Location s3Destination, AzureLocation azureDestination, Map setExif) { + this(imageIdentifier, quality, saveMetadata, skip, s3Destination, azureDestination, setExif, null); + } + + public SavedImage(String imageIdentifier, Integer quality, boolean saveMetadata, boolean skip, S3Location s3Destination, AzureLocation azureDestination, Map setExif, Map params) { if(s3Destination != null && azureDestination != null) throw new IllegalArgumentException("only one destination location may be specified"); @@ -49,6 +57,12 @@ public SavedImage(String imageIdentifier, Integer quality, boolean saveMetadata, this.azureDestination = azureDestination; this.setExif = setExif; + this.params = params; + } + + @JsonAnyGetter + public Map getParams() { + return params; } public static Builder withId(String imageIdentifier) { @@ -60,6 +74,7 @@ public static class Builder { private Integer quality; private boolean saveMetadata = false; private Map exif = new HashMap(); + private Map params = null; public Builder(String imageIdentifier) { this.imageIdentifier = imageIdentifier; @@ -76,16 +91,28 @@ public Builder withMetadata() { } public Builder withExifHeader(String key, Object value) { - exif.put(key, value); + exif.put(key, value); + return this; + } + + public Builder withParam(String key, Object value) { + if(params == null) { + params = new HashMap(); + } + params.put(key, value); return this; } private Map exifOrNull() { - return exif.isEmpty() ? null : exif; + return exif.isEmpty() ? null : exif; + } + + private Map paramsOrNull() { + return params; } public SavedImage toS3(S3Location s3Destination) { - return new SavedImage(imageIdentifier, quality, saveMetadata, false, s3Destination, null, exifOrNull()); + return new SavedImage(imageIdentifier, quality, saveMetadata, false, s3Destination, null, exifOrNull(), paramsOrNull()); } public SavedImage toS3(String bucket, String key) { @@ -93,7 +120,7 @@ public SavedImage toS3(String bucket, String key) { } public SavedImage toAzure(AzureLocation azureDestination) { - return new SavedImage(imageIdentifier, quality, saveMetadata, false, null, azureDestination, exifOrNull()); + return new SavedImage(imageIdentifier, quality, saveMetadata, false, null, azureDestination, exifOrNull(), paramsOrNull()); } public SavedImage toAzure(String accountName, String sharedAccessSignature) { @@ -101,7 +128,7 @@ public SavedImage toAzure(String accountName, String sharedAccessSignature) { } public SavedImage toBlitlineContainer() { - return new SavedImage(imageIdentifier, quality, saveMetadata, false, null, null, exifOrNull()); + return new SavedImage(imageIdentifier, quality, saveMetadata, false, null, null, exifOrNull(), paramsOrNull()); } public SavedImage butSkipSave() { diff --git a/blitline-image-client/src/test/java/com/blitline/image/functions/TestSerializer.java b/blitline-image-client/src/test/java/com/blitline/image/functions/TestSerializer.java index 308429a..65b9150 100644 --- a/blitline-image-client/src/test/java/com/blitline/image/functions/TestSerializer.java +++ b/blitline-image-client/src/test/java/com/blitline/image/functions/TestSerializer.java @@ -47,6 +47,9 @@ public void testJackson() throws JsonProcessingException { .toS3(S3Location.of("my-bucket-name", "abcd1234random.jpg")); System.out.println(mapper.writeValueAsString(save)); + save = SavedImage.withId("extraparams").withQuality(90).withParam("png_quantize", true).withParam("extension", ".png").toAzure(AzureLocation.of("myAccount", "http://gobbledygook")); + System.out.println(mapper.writeValueAsString(save)); + save = SavedImage.withId("4321nonrandom").withQuality(90).toAzure(AzureLocation.of("myAccount", "http://gobbledygook")); System.out.println(mapper.writeValueAsString(save));