[alchemy] Number format exception when there is no tag returned by the

API #216

Author: germanattanasio

src/main/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyVision.java

@@ -16,10 +16,12 @@
 import java.io.File;
 import java.net.URL;
 import java.util.HashMap;
+import java.util.ListIterator;
 import java.util.Map;
 
 import com.ibm.watson.developer_cloud.alchemy.v1.model.AlchemyGenericModel;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageFaces;
+import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageKeyword;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageKeywords;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageLink;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageSceneText;
@@ -71,6 +73,9 @@ public class AlchemyVision extends AlchemyService {
   /** The Constant URL. (value is "url") */
   public static final String URL = "url";
 
+  /** The Constant NO_TAGS. (value is "NO_TAGS") */
+  private static final String NO_TAGS = "NO_TAGS";
+
   /**
    * Executes the request and return the POJO that represent the response.
    * 
@@ -93,11 +98,11 @@ private <T extends AlchemyGenericModel> T executeRequest(Map<String, Object> par
         params.put(IMAGE_POST_MODE, RAW);
         final File image = (File) params.get(IMAGE);
         if (!image.exists()) {
-          throw new IllegalArgumentException("The file: " + image.getAbsolutePath()
-              + " does not exist.");
+          throw new IllegalArgumentException(
+              "The file: " + image.getAbsolutePath() + " does not exist.");
         } else {
-          requestBuilder.withBody(RequestBody.create(HttpMediaType.BINARY_FILE,
-              (File) params.get(IMAGE)));
+          requestBuilder
+              .withBody(RequestBody.create(HttpMediaType.BINARY_FILE, (File) params.get(IMAGE)));
           params.remove(IMAGE);
         }
       }
@@ -133,22 +138,23 @@ public ImageSceneText getImageSceneText(File image) {
 
     return executeRequest(params, AlchemyAPI.image_scene_text, ImageSceneText.class);
   }
-  
+
   /**
-   * Identifies text in an image specified by URL or in the primary image in a web page specified by URL
+   * Identifies text in an image specified by URL or in the primary image in a web page specified by
+   * URL
    * 
    * @param url the image URL
    * @return {@link ImageSceneText}
    */
   public ImageSceneText getImageSceneText(URL url) {
     Validate.notNull(url, "url cannot be null");
-    
+
     final Map<String, Object> params = new HashMap<String, Object>();
     params.put(URL, url);
-    
+
     return executeRequest(params, AlchemyAPI.image_scene_text, ImageSceneText.class);
   }
-  
+
   /**
    * Extracts keywords from an image
    * 
@@ -170,7 +176,16 @@ public ImageKeywords getImageKeywords(File image, Boolean forceShowAll, Boolean
     if (knowledgeGraph != null)
       params.put(KNOWLEDGE_GRAPH, knowledgeGraph ? 1 : 0);
 
-    return executeRequest(params, AlchemyAPI.image_keywords, ImageKeywords.class);
+    ImageKeywords imageKeywords = executeRequest(params, AlchemyAPI.image_keywords, ImageKeywords.class);
+    
+    // Remove the NO_TAGS keywords
+    ListIterator<ImageKeyword> iter = imageKeywords.getImageKeywords().listIterator();
+    while (iter.hasNext()){
+        if (iter.next().getText().equals(NO_TAGS)){
+            iter.remove();
+        }
+    }
+    return imageKeywords;
   }
 
 

src/main/java/com/ibm/watson/developer_cloud/alchemy/v1/model/ImageKeyword.java

@@ -13,13 +13,16 @@
  */
 package com.ibm.watson.developer_cloud.alchemy.v1.model;
 
+import com.google.gson.annotations.JsonAdapter;
 import com.ibm.watson.developer_cloud.alchemy.v1.AlchemyVision;
+import com.ibm.watson.developer_cloud.alchemy.v1.util.ImageKeywordTypeAdapter;
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 
 /**
  * ImageKeyword by the {@link AlchemyVision} service.
  * 
  */
+@JsonAdapter(ImageKeywordTypeAdapter.class)
 public class ImageKeyword extends GenericModel {
 
 

src/main/java/com/ibm/watson/developer_cloud/alchemy/v1/util/ImageKeywordTypeAdapter.java

@@ -0,0 +1,85 @@
+/**
+ * Copyright 2015 IBM Corp. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.ibm.watson.developer_cloud.alchemy.v1.util;
+
+import java.io.IOException;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageKeyword;
+
+/**
+ * Type Adapter for the {@link ImageKeyword} class.
+ */
+public class ImageKeywordTypeAdapter extends TypeAdapter<ImageKeyword> {
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see com.google.gson.TypeAdapter#read(com.google.gson.stream.JsonReader)
+   */
+  @Override
+  public ImageKeyword read(JsonReader reader) throws IOException {
+    if (reader.peek() == JsonToken.NULL) {
+      reader.nextNull();
+      return null;
+    }
+
+    final ImageKeyword ImageKeyword = new ImageKeyword();
+    reader.beginObject();
+    while (reader.hasNext()) {
+      final String name = reader.nextName();
+
+      if (name.equals("text")) {
+        final String text = reader.nextString();
+        ImageKeyword.setText(text);
+      } else if (name.equals("score")) {
+        final String score = reader.nextString();
+        if (score != null && !score.isEmpty())
+          ImageKeyword.setScore(Double.valueOf(score));
+      } else {
+        reader.skipValue();
+      }
+    }
+    reader.endObject();
+    return ImageKeyword;
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see com.google.gson.TypeAdapter#write(com.google.gson.stream.JsonWriter, java.lang.Object)
+   */
+  @Override
+  public void write(JsonWriter writer, ImageKeyword value) throws IOException {
+    if (value == null) {
+      writer.nullValue();
+      return;
+    }
+
+    writer.beginObject();
+
+    if (value.getScore() != null)
+      writer.name("score").value(value.getScore());
+    if (value.getText() != null)
+      writer.name("text").value(value.getText());
+
+    writer.endObject();
+    writer.flush();
+  }
+
+
+}