[tone-analyzer] Add support for v3

Author: germanattanasio

src/main/java/com/ibm/watson/developer_cloud/tone_analyzer/v3/ToneAnalyzer.java

@@ -13,50 +13,49 @@
  */
 package com.ibm.watson.developer_cloud.tone_analyzer.v3;
 
-import java.lang.reflect.Type;
-import java.util.List;
-
 import com.google.gson.JsonObject;
-import com.google.gson.reflect.TypeToken;
-import com.ibm.watson.developer_cloud.http.HttpMediaType;
 import com.ibm.watson.developer_cloud.http.RequestBuilder;
 import com.ibm.watson.developer_cloud.service.WatsonService;
-import com.ibm.watson.developer_cloud.tone_analyzer.v1.model.Scorecard;
-import com.ibm.watson.developer_cloud.tone_analyzer.v1.model.SynonymOptions;
-import com.ibm.watson.developer_cloud.tone_analyzer.v1.model.SynonymResult;
 import com.ibm.watson.developer_cloud.tone_analyzer.v1.model.Tone;
 import com.ibm.watson.developer_cloud.tone_analyzer.v3.model.ToneAnalysis;
-import com.ibm.watson.developer_cloud.util.GsonSingleton;
-import com.ibm.watson.developer_cloud.util.ResponseUtil;
 import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
 
 /**
  * The IBM Watson The Tone Analyzer service uses linguistic analysis to detect emotional tones,
  * social propensities, and writing styles in written communication. Then it offers suggestions to
  * help the writer improve their intended language tones.
  * 
  * @version v1
- * @see <a
- *      href="http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/tone-analyzer.html">
- *      Tone Analyzer</a>
+ * @see <a href=
+ *      "http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/tone-analyzer.html"> Tone
+ *      Analyzer</a>
  */
 public class ToneAnalyzer extends WatsonService {
 
+  private static final String VERSION_DATE = "version";
   private static final String PATH_TONE = "/v3/tone";
   private static final String TEXT = "text";
-  private static final String URL =
-      "https://gateway.watsonplatform.net/tone-analyzer-beta/api";
+  private static final String URL = "https://gateway.watsonplatform.net/tone-analyzer-beta/api";
+  private String versionDate;
+
+  /** The version date */
+  public static final String VERSION_DATE_2016_02_11 = "2016-02-11";
+
 
   /**
-   * Instantiates a new Tone Analyzer service.
+   * Instantiates a new tone analyzer.
+   *
+   * @param versionDate The version date (yyyy-MM-dd) of the REST API to use. Specifying this value
+   *        will keep your API calls from failing when the service introduces breaking changes.
    */
-  public ToneAnalyzer() {
+  public ToneAnalyzer(String versionDate) {
     super("tone_analyzer");
     setEndPoint(URL);
+    this.versionDate = versionDate;
   }
 
 
+
   /**
    * Analyzes the "tone" of a piece of text. The message is analyzed from several tones (social
    * tone, emotional tone, writing tone), and for each of them various traits are derived (such as
@@ -74,7 +73,10 @@ public ToneAnalysis getTone(final String text) {
     final JsonObject contentJson = new JsonObject();
     contentJson.addProperty(TEXT, text);
 
-    final Request request = RequestBuilder.post(PATH_TONE).withBodyJson(contentJson).build();
+    final Request request = RequestBuilder.post(PATH_TONE)
+        .withQuery(VERSION_DATE, versionDate)
+        .withBodyJson(contentJson)
+        .build();
     return executeRequest(request, ToneAnalysis.class);
   }
 

src/main/java/com/ibm/watson/developer_cloud/tone_analyzer/v3/model/ElementTone.java

@@ -1,30 +1,57 @@
+/**
+ * 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.tone_analyzer.v3.model;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import com.google.gson.annotations.SerializedName;
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 
 /**
  * This object represents the results of Tone analysis on an element; which may be a document or a sentence.
  * Its structure is a 2-level tree, with tone categories in the top level and the individual tones (and their
  * scores) in leaves.
  *
- * @author Hernan Badenes
- *
  */
 public class ElementTone extends GenericModel {
 
-	List<ToneCategory> tones = new ArrayList<ToneCategory>();
+    @SerializedName("tone_categories")
+	private List<ToneCategory> tones;
 
+	/**
+	 * Gets the tones.
+	 *
+	 * @return the tones
+	 */
 	public List<ToneCategory> getTones() {
 		return tones;
 	}
 
+	/**
+	 * Sets the tones.
+	 *
+	 * @param tones the new tones
+	 */
 	public void setTones(List<ToneCategory> tones) {
 		this.tones = tones;
 	}
 
+	/**
+	 * Adds the tone.
+	 *
+	 * @param tone the tone
+	 */
 	public void addTone(ToneCategory tone) {
 		this.tones.add(tone);
 	}

src/main/java/com/ibm/watson/developer_cloud/tone_analyzer/v3/model/SentenceAnalysis.java

@@ -0,0 +1,111 @@
+/**
+ * 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.tone_analyzer.v3.model;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * This element contains the result of analyzing an individual sentence. It contains a list of
+ * ToneCategory objects which is the actual result, and also some metadata about the sentence: The
+ * original text (if it needs to be tracked back), and the position of the sentence in the original
+ * text (as index of first and last character).
+ * 
+ */
+public class SentenceTone extends ElementTone {
+
+  @SerializedName("sentence_id")
+  private Integer id;
+
+  @SerializedName("input_from")
+  private Integer inputFrom;
+
+  @SerializedName("input_to")
+  private Integer inputTo;
+
+  @SerializedName("text")
+  private String text;
+
+  /**
+   * Gets the id.
+   *
+   * @return the id
+   */
+  public Integer getId() {
+    return id;
+  }
+
+  /**
+   * Sets the id.
+   *
+   * @param id the new id
+   */
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  /**
+   * Gets the input from.
+   *
+   * @return the input from
+   */
+  public Integer getInputFrom() {
+    return inputFrom;
+  }
+
+  /**
+   * Sets the input from.
+   *
+   * @param inputFrom the new input from
+   */
+  public void setInputFrom(Integer inputFrom) {
+    this.inputFrom = inputFrom;
+  }
+
+  /**
+   * Gets the input to.
+   *
+   * @return the input to
+   */
+  public Integer getInputTo() {
+    return inputTo;
+  }
+
+  /**
+   * Sets the input to.
+   *
+   * @param inputTo the new input to
+   */
+  public void setInputTo(Integer inputTo) {
+    this.inputTo = inputTo;
+  }
+
+  /**
+   * Gets the text.
+   *
+   * @return the text
+   */
+  public String getText() {
+    return text;
+  }
+
+  /**
+   * Sets the text.
+   *
+   * @param text the new text
+   */
+  public void setText(String text) {
+    this.text = text;
+  }
+
+}