added byte array support to classify an in memory image

MJonker · Nov 22, 2016 · f55253c · f55253c
1 parent b6de93a
commit f55253c
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/...src/main/java/com/ibm/watson/developer_cloud/visual_recognition/v3/VisualRecognition.java b/...src/main/java/com/ibm/watson/developer_cloud/visual_recognition/v3/VisualRecognition.java
@@ -180,6 +180,12 @@ public ServiceCall<VisualClassification> classify(ClassifyImagesOptions options)
       RequestBody requestBody = RequestBody.create(HttpMediaType.BINARY_FILE, options.images());
       bodyBuilder.addFormDataPart(PARAM_IMAGES_FILE, options.images().getName(), requestBody);
     }
+
+    if (options.imagesBinary() != null) {
+    	RequestBody requestBody = RequestBody.create(HttpMediaType.BINARY_FILE, options.imagesBinary());
+    	bodyBuilder.addFormDataPart(PARAM_IMAGES_FILE, options.imageName(), requestBody);
+    }
+
     bodyBuilder.addFormDataPart(PARAM_PARAMETERS, getParametersAsJson(options).toString());
 
     RequestBuilder requestBuilder = RequestBuilder.post(PATH_CLASSIFY);

diff --git a/...ava/com/ibm/watson/developer_cloud/visual_recognition/v3/model/ClassifyImagesOptions.java b/...ava/com/ibm/watson/developer_cloud/visual_recognition/v3/model/ClassifyImagesOptions.java
@@ -27,15 +27,19 @@ public class ClassifyImagesOptions {
 
   private ClassifyImagesOptions(Builder builder) {
     imagesFile = builder.imagesFile;
+    imagesBinary = builder.imagesBinary;
     url = builder.url;
     classifierIds = builder.classifierIds;
     threshold = builder.threshold;
+    imageName = builder.imageName;
   }
 
   private File imagesFile;
+  private byte[] imagesBinary;
   private HttpUrl url;
   private List<String> classifierIds;
   private Double threshold;
+  private String imageName="placeholder.png";
 
   /**
    * Classify Images Request Builder.
@@ -45,11 +49,14 @@ public static class Builder {
     private HttpUrl url;
     private List<String> classifierIds;
     private Double threshold;
+    private byte[] imagesBinary;
+    private String imageName="placeholder.png";
 
 
     private Builder(ClassifyImagesOptions options) {
       this();
       imagesFile = options.imagesFile;
+      imagesBinary = options.imagesBinary;
       url = options.url;
       classifierIds = new ArrayList<String>(options.classifierIds);
       threshold = options.threshold;
@@ -66,6 +73,19 @@ public Builder images(File imagesFile) {
       this.imagesFile = imagesFile;
       return this;
     }
+
+    /**
+     * Sets the images.
+     *
+     * @param imagesBinary the images bytes
+     * @return the builder
+     */
+    public Builder images(byte[] imagesBinary, String imageName) {
+      Validator.notNull(imagesBinary, "'imagesBinary' cannot be null");
+      this.imagesBinary = imagesBinary;
+      this.imageName = imageName;
+      return this;
+    }
 
     /**
      * Sets the image url.
@@ -139,7 +159,7 @@ public Builder() { }
      * @return the profile options
      */
     public ClassifyImagesOptions build() {
-      Validator.isTrue((url != null) || (imagesFile != null), "url or imagesFile should be specified");
+      Validator.isTrue((url != null) || (imagesFile != null || imagesBinary!=null), "url or imagesFile or imagesBinary should be specified");
       return new ClassifyImagesOptions(this);
     }
 
@@ -153,6 +173,19 @@ public ClassifyImagesOptions build() {
   public File images() {
     return imagesFile;
   }
+
+  /**
+   * Returns the images binary.
+   *
+   * @return the images binary
+   */
+  public byte[] imagesBinary() {
+    return imagesBinary;
+  }
+
+  public String imageName() {
+	  return imageName;
+  }
 
   /**
    * Returns the {@link HttpUrl}.