[alchemy] added emotion analysis #197

Author: germanattanasio

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

@@ -23,6 +23,7 @@
 import com.ibm.watson.developer_cloud.alchemy.v1.model.Concepts;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.Dates;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentAuthors;
+import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentEmotion;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentPublicationDate;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentSentiment;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentText;
@@ -275,12 +276,23 @@ public DocumentTitle getTitle(Map<String, Object> params) {
     return executeRequest(params, AlchemyAPI.title, DocumentTitle.class, HTML, URL);
   }
 
+  /**
+   * Detects emotions in a text, URL or HTML.
+   * 
+   * @param params The parameters to be used in the service call, text, html or url should be
+   *        specified
+   * @return {@link DocumentEmotion}
+   */
+  public DocumentEmotion getEmotion(Map<String, Object> params) {
+    return executeRequest(params, AlchemyAPI.emotion, DocumentEmotion.class, TEXT, HTML, URL);
+  }
+
   /**
    * Extracts dates for text, a URL or HTML.
    * 
    * @param params The parameters to be used in the service call, text, html or url should be
    *        specified.
-   * @return {@link DocumentTitle}
+   * @return {@link Dates}
    */
   public Dates getDates(Map<String, Object> params) {
 

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

@@ -0,0 +1,169 @@
+/**
+ * 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.model;
+
+import com.google.gson.annotations.SerializedName;
+import com.ibm.watson.developer_cloud.alchemy.v1.AlchemyLanguage;
+import com.ibm.watson.developer_cloud.service.model.GenericModel;
+
+/**
+ * The document emotion from {@link AlchemyLanguage#getEmotion(java.util.Map)}
+ *
+ */
+public class DocumentEmotion extends AlchemyLanguageGenericModel {
+
+  /**
+   * The extracted emotion from {@link AlchemyLanguage#getEmotion(java.util.Map)}
+   */
+  public static class Emotion extends GenericModel {
+    private Double anger;
+    private Double disgust;
+    private Double fear;
+    private Double joy;
+    private Double sadness;
+
+    /**
+     * Gets the anger.
+     *
+     * @return the anger
+     */
+    public Double getAnger() {
+      return anger;
+    }
+
+    /**
+     * Gets the disgust.
+     *
+     * @return the disgust
+     */
+    public Double getDisgust() {
+      return disgust;
+    }
+
+    /**
+     * Gets the fear.
+     *
+     * @return the fear
+     */
+    public Double getFear() {
+      return fear;
+    }
+
+    /**
+     * Gets the joy.
+     *
+     * @return the joy
+     */
+    public Double getJoy() {
+      return joy;
+    }
+
+    /**
+     * Gets the sadness.
+     *
+     * @return the sadness
+     */
+    public Double getSadness() {
+      return sadness;
+    }
+
+    /**
+     * Sets the anger.
+     *
+     * @param anger the new anger
+     */
+    public void setAnger(Double anger) {
+      this.anger = anger;
+    }
+
+    /**
+     * Sets the disgust.
+     *
+     * @param disgust the new disgust
+     */
+    public void setDisgust(Double disgust) {
+      this.disgust = disgust;
+    }
+
+    /**
+     * Sets the fear.
+     *
+     * @param fear the new fear
+     */
+    public void setFear(Double fear) {
+      this.fear = fear;
+    }
+
+    /**
+     * Sets the joy.
+     *
+     * @param joy the new joy
+     */
+    public void setJoy(Double joy) {
+      this.joy = joy;
+    }
+
+    /**
+     * Sets the sadness.
+     *
+     * @param sadness the new sadness
+     */
+    public void setSadness(Double sadness) {
+      this.sadness = sadness;
+    }
+
+  }
+
+  @SerializedName("docEmotions")
+  private Emotion emotion;
+
+  private String text;
+
+  /**
+   * Gets the emotion.
+   *
+   * @return the emotion
+   */
+  public Emotion getEmotion() {
+    return emotion;
+  }
+
+  /**
+   * Gets the text.
+   *
+   * @return the text
+   */
+  public String getText() {
+    return text;
+  }
+
+  /**
+   * Sets the emotion.
+   *
+   * @param emotion the new emotion
+   */
+  public void setEmotion(Emotion emotion) {
+    this.emotion = emotion;
+  }
+
+  /**
+   * Sets the text.
+   *
+   * @param text the new text
+   */
+  public void setText(String text) {
+    this.text = text;
+  }
+}
+

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

@@ -98,9 +98,12 @@ public enum AlchemyAPI {
 
     /** The publication date */
     publication_date,
-    
+
     /** dates */
-    dates
+    dates,
+
+    /** emotion */
+    emotion
   }
 
   /** The file where alchemy endpoints are described. */

src/main/resources/alchemy_endpoints.json

@@ -24,6 +24,11 @@
     "text": "/text/TextGetTextSentiment",
     "html": "/html/HTMLGetTextSentiment"
   },
+  "emotion": {
+    "url": "/url/URLGetEmotion",
+    "text": "/text/TextGetEmotion",
+    "html": "/html/HTMLGetEmotion"
+  },
   "sentiment_targeted": {
     "url": "/url/URLGetTargetedSentiment",
     "text": "/text/TextGetTargetedSentiment",

src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyLanguageIT.java

@@ -27,6 +27,7 @@
 import com.ibm.watson.developer_cloud.alchemy.v1.model.Concepts;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.Dates;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentAuthors;
+import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentEmotion;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentPublicationDate;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentSentiment;
 import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentText;
@@ -128,7 +129,7 @@ public void testGetConceptsHTML() {
   }
 
   /**
-   * Test get concepts HTML.
+   * Test get concepts Tet.
    */
   @Test
   public void testGetConceptsText() {
@@ -427,4 +428,42 @@ public void testGetDates() {
     Assert.assertFalse(dates.getDates().isEmpty());
   }
 
+  /**
+   * Test get emotion from HTML.
+   */
+  @Test
+  public void testGetEmotionHTML() {
+    final Map<String, Object> params = new HashMap<String, Object>();
+    params.put(AlchemyLanguage.HTML, htmlExample);
+    final DocumentEmotion emotion = service.getEmotion(params);
+    Assert.assertNotNull(emotion);
+    Assert.assertNotNull(emotion.getEmotion());
+    System.out.println(emotion);
+  }
+
+  /**
+   * Test get emotion from text.
+   */
+  @Test
+  public void testGetEmotionText() {
+    final Map<String, Object> params = new HashMap<String, Object>();
+    params.put(AlchemyLanguage.TEXT, htmlExample);
+    final DocumentEmotion emotion = service.getEmotion(params);
+    Assert.assertNotNull(emotion);
+    Assert.assertNotNull(emotion.getEmotion());
+    System.out.println(emotion);
+  }
+
+  /**
+   * Test Get emotion from URL.
+   */
+  @Test
+  public void testGetEmotionUrl() {
+    final Map<String, Object> params = new HashMap<String, Object>();
+    params.put(AlchemyLanguage.URL, "http://www.techcrunch.com/");
+    final DocumentEmotion emotion = service.getEmotion(params);
+    Assert.assertNotNull(emotion);
+    Assert.assertNotNull(emotion.getEmotion());
+    System.out.println(emotion);
+  }
 }