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

Author: germanattanasio

.gitignore

@@ -12,4 +12,6 @@ gradlew.bat
 target
 bin/
 *.iml
+*.ipr
+*.iws
 src/test/resources/config.properties

.utility/push-javadoc-to-gh-pages.sh

@@ -13,6 +13,13 @@ if [ "$TRAVIS_REPO_SLUG" == "watson-developer-cloud/java-sdk" ] && [ "$TRAVIS_PU
 
     cp -rf ../target/site/apidocs/* docs/$TRAVIS_BRANCH
     ../.utility/generate_index_html.sh > index.html
+    
+	# update the latest/ symlink
+    # on tagged builds, $TRAVIS_TAG is set to the tag, but it's blank on regular builds, unlike $TRAVIS_BRANCH
+    if [ $TRAVIS_TAG ]; then
+      rm latest
+      ln -s ./$TRAVIS_TAG latest
+    fi
 
     git add -f .
     git commit -m "Latest javadoc for $TRAVIS_BRANCH ($TRAVIS_COMMIT)"

README.md

@@ -363,20 +363,21 @@ Use the [Tone Analyzer][tone_analyzer] service to get the tone of your email.
 ToneAnalyzer service = new ToneAnalyzer(ToneAnalyzer.VERSION_DATE_2016_02_11);
 service.setUsernameAndPassword("<username>", "<password>");
 
-
-String text = "I know the times are difficult! Our sales have been "
-	+ "disappointing for the past three quarters for our data analytics "
-	+ "product suite. We have a competitive data analytics product "
-	+ "suite in the industry. But we need to do our job selling it! "
-	+ "We need to acknowledge and fix our sales challenges.";
+String text =
+  "I know the times are difficult! Our sales have been "
+      + "disappointing for the past three quarters for our data analytics "
+      + "product suite. We have a competitive data analytics product "
+      + "suite in the industry. But we need to do our job selling it! "
+      + "We need to acknowledge and fix our sales challenges. "
+      + "We can’t blame the economy for our lack of execution! "
+      + "We are missing critical sales opportunities. "
+      + "Our product is in no way inferior to the competitor products. "
+      + "Our clients are hungry for analytical tools to improve their "
+      + "business outcomes. Economy has nothing to do with it.";
 
 // Call the service and get the tone
-Tone tone = service.getTone(text, Scorecard.EMAIL);
-System.out.println(tone);
-
-
 ToneAnalysis tone = service.getTone(text);
-System.out.println(tone);    
+System.out.println(tone);
 ```
 
 

build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'eclipse'
+apply plugin: 'idea'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6

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/ImageKeyword.java

@@ -32,6 +32,9 @@ public class ImageKeyword extends GenericModel {
   /** The text. */
   private String text;
 
+  /** The hierarchy. */
+  private String hierarchy;
+
   /**
    * Gets the score.
    * 
@@ -68,4 +71,22 @@ public void setText(String text) {
     this.text = text;
   }
 
+  /**
+   * Sets the hierarchy.
+   *
+   * @param hierarchy The hierarchy.
+   */
+  public void setHierarchy(String hierarchy) {
+    this.hierarchy = hierarchy;
+  }
+
+  /**
+   * Gets the hierarchy. A value is only present if the request that produced this instance
+   * was made with {@code knowledgeGraph = true}.
+   *
+   * @return The hierarchy, if it exists.
+   */
+  public String getHierarchy() {
+    return hierarchy;
+  }
 }

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/ImageKeywordTypeAdapter.java

@@ -13,14 +13,14 @@
  */
 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;
 
+import java.io.IOException;
+
 /**
  * Type Adapter for the {@link ImageKeyword} class.
  */
@@ -50,6 +50,16 @@ public ImageKeyword read(JsonReader reader) throws IOException {
         final String score = reader.nextString();
         if (score != null && !score.isEmpty())
           ImageKeyword.setScore(Double.valueOf(score));
+      } else if (name.equals("knowledgeGraph")) {
+        reader.beginObject();
+        if (reader.hasNext() && reader.nextName().equals("typeHierarchy")) {
+          final String hierarchy = reader.nextString();
+          ImageKeyword.setHierarchy(hierarchy);
+        }
+        while (reader.hasNext()) {
+          reader.skipValue();
+        }
+        reader.endObject();
       } else {
         reader.skipValue();
       }

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());