Merge branch 'master' into master

Author: GrapeBaBa

examples/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TranslateAndSynthesizeExample.java

@@ -0,0 +1,35 @@
+package com.ibm.watson.developer_cloud.text_to_speech.v1;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+import com.ibm.watson.developer_cloud.http.HttpMediaType;
+import com.ibm.watson.developer_cloud.language_translation.v2.LanguageTranslation;
+import com.ibm.watson.developer_cloud.language_translation.v2.model.TranslationResult;
+import com.ibm.watson.developer_cloud.text_to_speech.v1.TextToSpeech;
+import com.ibm.watson.developer_cloud.text_to_speech.v1.model.Voice;
+
+public class TranslateAndSynthesizeExample {
+
+  public static void main(String[] args) throws IOException {
+    LanguageTranslation translator = new LanguageTranslation();
+    translator.setUsernameAndPassword("username", "password");
+    
+    TextToSpeech synthesizer = new TextToSpeech();
+    synthesizer.setUsernameAndPassword("username", "password");
+    
+    String text = "Greetings from Watson Developer Cloudl";
+    
+    // translate 
+    TranslationResult translationResult = translator.translate(text, "en", "es");
+    String translation = translationResult.getTranslations().get(0).getTranslation();
+
+    // synthesize
+    InputStream in = synthesizer.synthesize(translation, Voice.ES_LAURA, HttpMediaType.AUDIO_WAV);
+    Files.copy(in, Paths.get("output.wav"), StandardCopyOption.REPLACE_EXISTING);
+
+  }
+}

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

@@ -80,7 +80,7 @@ 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;
 

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

@@ -177,13 +177,13 @@ public ImageKeywords getImageKeywords(File image, Boolean forceShowAll, Boolean
       params.put(KNOWLEDGE_GRAPH, knowledgeGraph ? 1 : 0);
 
     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();
-        }
+    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/DocumentPublicationDate.java

@@ -1,17 +1,15 @@
 /**
  * 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
+ * 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
+ * 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.
+ * 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.model;
 

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

@@ -126,19 +126,19 @@ public void setScore(Double score) {
   private Gender gender;
 
   /** The height. */
-  private String height;
+  private Integer height;
 
   /** The identity. */
   private Identity identity;
 
   /** The position x. */
-  private String positionX;
+  private Integer positionX;
 
   /** The position y. */
-  private String positionY;
+  private Integer positionY;
 
   /** The width. */
-  private String width;
+  private Integer width;
 
   /**
    * Gets the age.
@@ -163,7 +163,7 @@ public Gender getGender() {
    * 
    * @return The height
    */
-  public String getHeight() {
+  public Integer getHeight() {
     return height;
   }
 
@@ -181,7 +181,7 @@ public Identity getIdentity() {
    * 
    * @return The positionX
    */
-  public String getPositionX() {
+  public Integer getPositionX() {
     return positionX;
   }
 
@@ -190,7 +190,7 @@ public String getPositionX() {
    * 
    * @return The positionY
    */
-  public String getPositionY() {
+  public Integer getPositionY() {
     return positionY;
   }
 
@@ -199,7 +199,7 @@ public String getPositionY() {
    * 
    * @return The width
    */
-  public String getWidth() {
+  public Integer getWidth() {
     return width;
   }
 
@@ -226,7 +226,7 @@ public void setGender(Gender gender) {
    * 
    * @param height The height
    */
-  public void setHeight(String height) {
+  public void setHeight(Integer height) {
     this.height = height;
   }
 
@@ -244,7 +244,7 @@ public void setIdentity(Identity identity) {
    * 
    * @param positionX The positionX
    */
-  public void setPositionX(String positionX) {
+  public void setPositionX(Integer positionX) {
     this.positionX = positionX;
   }
 
@@ -253,7 +253,7 @@ public void setPositionX(String positionX) {
    * 
    * @param positionY The positionY
    */
-  public void setPositionY(String positionY) {
+  public void setPositionY(Integer positionY) {
     this.positionY = positionY;
   }
 
@@ -262,7 +262,7 @@ public void setPositionY(String positionY) {
    * 
    * @param width The width
    */
-  public void setWidth(String width) {
+  public void setWidth(Integer width) {
     this.width = width;
   }
 }

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

@@ -32,7 +32,7 @@ public class ImageSceneText extends AlchemyGenericModel {
 
   /** The scene text. */
   private String sceneText;
-  
+
   /**
    * Gets the image faces.
    * 
@@ -59,7 +59,7 @@ public String getUrl() {
   public String getSceneText() {
     return sceneText;
   }
-  
+
   /**
    * Sets the image faces.
    * 

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

@@ -28,16 +28,16 @@ public class ImageSceneTextLine extends GenericModel {
    * Region.
    */
   public static class Region extends GenericModel {
-    
+
     /** The height. */
     private Integer height;
-    
+
     /** The width. */
     private Integer width;
-    
+
     /** The x. */
     private Integer x;
-    
+
     /** The y. */
     private Integer y;
 
@@ -118,13 +118,13 @@ public void setY(Integer y) {
    * A word within a line of text.
    */
   public static class Word extends GenericModel {
-    
+
     /** The confidence. */
     private Double confidence;
-    
+
     /** The region. */
     private Region region;
-    
+
     /** The text. */
     private String text;
 
@@ -186,13 +186,13 @@ public void setText(String text) {
 
   /** The confidence. */
   private Double confidence;
-  
+
   /** The region. */
   private Region region;
-  
+
   /** The text. */
   private String text;
-  
+
   /** The words. */
   private List<Word> words;
 

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

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

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

@@ -30,16 +30,13 @@ public class Sentiment extends GenericModel {
   public enum SentimentType {
 
     /** negative sentiment. */
-    @SerializedName("negative")
-    NEGATIVE,
+    @SerializedName("negative") NEGATIVE,
 
     /** neutral sentiment. */
-    @SerializedName("neutral")
-    NEUTRAL,
+    @SerializedName("neutral") NEUTRAL,
 
     /** positive sentiment. */
-    @SerializedName("positive")
-    POSITIVE
+    @SerializedName("positive") POSITIVE
   }
 
   /** The mixed. */