Merge branch 'master' of github.com:watson-developer-cloud/java-sdk

Author: GrapeBaBa

examples/java/com/ibm/watson/developer_cloud/alchemy_data_news/v1/GetNewsDocumentExample.java

@@ -26,7 +26,8 @@
 /**
  * Getting 7 documents between Friday 28th August 2015 and Friday 4th September 2015 using the
  * {@link AlchemyDataNews} API.
- *
+ * 
+ * Example from java-sdk: https://github.com/watson-developer-cloud/java-sdk
  */
 public class GetNewsDocumentExample {
 
@@ -44,6 +45,10 @@ public static void main(String[] args) {
     params.put(AlchemyDataNews.START, "1440720000");
     params.put(AlchemyDataNews.END, "1441407600");
     params.put(AlchemyDataNews.COUNT, 7);
+    //Query on adjacent nested fields: 
+    params.put("q.enriched.url.enrichedTitle.entities.entity", "|text=IBM,type=company|");
+    params.put("q.enriched.url.enrichedTitle.docSentiment.type", "positive");
+    params.put("q.enriched.url.enrichedTitle.taxonomy.taxonomy_.label", "technology and computing");
 
     DocumentsResult result = service.getNewsDocuments(params);
 

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

@@ -32,6 +32,7 @@
 import com.ibm.watson.developer_cloud.alchemy.v1.model.Feeds;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.Keywords;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.Language;
+import com.ibm.watson.developer_cloud.alchemy.v1.model.LanguageSelection;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.Microformats;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.SAORelations;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.Taxonomies;
@@ -79,6 +80,9 @@ public class AlchemyLanguage extends AlchemyService {
   public static final String XPATH = "xpath";
   public static final String TARGETS = "targets";
   public static final String ANCHOR_DATE = "anchorDate";
+  
+  // language to be used with request
+  private LanguageSelection language = LanguageSelection.DETECT;
 
   private static final SimpleDateFormat anchorDateFormat =
       new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -105,6 +109,10 @@ private <T extends AlchemyGenericModel> T executeRequest(Map<String, Object> par
     // Return json
     params.put(OUTPUT_MODE, "json");
 
+    if (language != LanguageSelection.DETECT) {
+      params.put("language", language.toString().toLowerCase());
+    }
+
     // Prevent jsonp to be returned
     params.remove(JSONP);
 
@@ -115,6 +123,17 @@ private <T extends AlchemyGenericModel> T executeRequest(Map<String, Object> par
     return executeRequest(requestBuilder.build(), returnType);
   }
 
+
+  /**
+   * Allows users to set language of input text.
+   *
+   * @param language The language to use
+   */
+  public void setLanguage(LanguageSelection language) {
+    this.language = language;
+  }
+
+
   /**
    * Extracts the authors from a URL or HTML.
    * 

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

@@ -0,0 +1,13 @@
+package com.ibm.watson.developer_cloud.alchemy.v1.model;
+
+public enum LanguageSelection {
+  ENGLISH,
+  FRENCH,
+  GERMAN,
+  ITALIAN,
+  PORTUGESE,
+  RUSSIAN,
+  SPANISH,
+  SWEDISH,
+  DETECT
+}

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

@@ -78,8 +78,8 @@ public void write(JsonWriter writer, Taxonomy value) throws IOException {
 
     if (value.getScore() != null)
       writer.name("score").value(value.getScore());
-    if (value.getConfident() != null)
-      writer.name("confident").value(value.getConfident());
+    if (value.getConfident() == false)
+      writer.name("confident").value("no");
     if (value.getLabel() != null)
       writer.name("label").value(value.getLabel());